diff --git a/.github/workflows/ci-emscripten.yml b/.github/workflows/ci-emscripten.yml
index fbd66ee461..67a7ae9dbb 100644
--- a/.github/workflows/ci-emscripten.yml
+++ b/.github/workflows/ci-emscripten.yml
@@ -26,6 +26,10 @@ jobs:
with:
ref: ${{ github.event.inputs.ref }}
+ - name: Fix dubious ownership
+ run: |
+ git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
- name: Setup cache
uses: actions/cache@v4
with:
diff --git a/cmake/scripts/FindVersion.cmake b/cmake/scripts/FindVersion.cmake
index bfbd135644..470fca98ca 100644
--- a/cmake/scripts/FindVersion.cmake
+++ b/cmake/scripts/FindVersion.cmake
@@ -57,7 +57,6 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
)
string(REGEX REPLACE "([0-9]+)-([0-9]+)-([0-9]+).*" "\\1\\2\\3" COMMITDATE "${COMMITDATE}")
set(REV_ISODATE "${COMMITDATE}")
- string(SUBSTRING "${REV_ISODATE}" 0 4 REV_YEAR)
# Get the branch
execute_process(COMMAND ${GIT_EXECUTABLE} -C "${CMAKE_SOURCE_DIR}" symbolic-ref -q HEAD
@@ -127,7 +126,6 @@ elseif(EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev-vc")
list(GET OTTDREV 3 REV_HASH)
list(GET OTTDREV 4 REV_ISTAG)
list(GET OTTDREV 5 REV_ISSTABLETAG)
- list(GET OTTDREV 6 REV_YEAR)
if(REV_MODIFIED EQUAL 2)
string(REGEX REPLACE "M$" "" REV_VERSION "${REV_VERSION}")
endif()
@@ -160,7 +158,6 @@ elseif(EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev")
list(GET OTTDREV 3 REV_HASH)
list(GET OTTDREV 4 REV_ISTAG)
list(GET OTTDREV 5 REV_ISSTABLETAG)
- list(GET OTTDREV 6 REV_YEAR)
set(REV_RELEASE "jgrpp-0.0")
else()
message(WARNING "No version detected; this build will NOT be network compatible")
@@ -171,17 +168,22 @@ else()
set(REV_HASH "unknown")
set(REV_ISTAG 0)
set(REV_ISSTABLETAG 0)
- set(REV_YEAR "1970")
endif()
string(REGEX MATCH "^jgrpp-[0-9]+(\.[0-9]+)?(\.[0-9]+)?" REV_RELEASE "${REV_RELEASE}")
string(REPLACE "jgrpp-" "" REV_RELEASE "${REV_RELEASE}")
+# Extract REV_YEAR and REV_DATE from REV_ISODATE
+string(SUBSTRING "${REV_ISODATE}" 0 4 REV_YEAR)
+string(SUBSTRING "${REV_ISODATE}" 4 4 REV_DATE)
+# Drop leading 0 in REV_DATE if any
+string(REGEX REPLACE "^0?([0-9]+)" "\\1" REV_DATE "${REV_DATE}")
+
message(STATUS "Version string: ${REV_VERSION}, Release: ${REV_RELEASE}")
if(GENERATE_OTTDREV)
message(STATUS "Generating ${GENERATE_OTTDREV}")
- file(WRITE ${CMAKE_SOURCE_DIR}/${GENERATE_OTTDREV} "${REV_VERSION}\t${REV_ISODATE}\t${REV_MODIFIED}\t${REV_HASH}\t${REV_ISTAG}\t${REV_ISSTABLETAG}\t${REV_YEAR}\n")
+ file(WRITE ${CMAKE_SOURCE_DIR}/${GENERATE_OTTDREV} "${REV_VERSION}\t${REV_ISODATE}\t${REV_MODIFIED}\t${REV_HASH}\t${REV_ISTAG}\t${REV_ISSTABLETAG}\n")
elseif(NOT "${FIND_VERSION_BINARY_DIR}" STREQUAL "")
message(STATUS "Generating rev.cpp")
configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in"
diff --git a/docs/landscape.html b/docs/landscape.html
index 9ec8eeef89..3454ed6718 100644
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -911,7 +911,7 @@
m2: index into the array of stations
m3 bits 7..4: persistent random data for railway stations/waypoints and airports)
m3 bits 7..4: owner of tram tracks (road stop)
- m3 bits 3..2: ground type (road waypoints)
+ m3 bits 3..2: ground type (road waypoints)
| 0 |
@@ -1076,7 +1076,7 @@
m7 bits 4..0: owner of road (road stops)
m7: animation frame (railway stations/waypoints, airports)
- m8 bit 15: Snow or desert present (road waypoints)
+ m8 bit 15: Snow or desert present (road waypoints)
m8 bits 14..12: Road cached one way state
m8 bits 11..6: Tramtype
m8 bits 5..0: track type for railway stations/waypoints
diff --git a/media/baseset/CMakeLists.txt b/media/baseset/CMakeLists.txt
index 405e9bb039..3ffaaf71cf 100644
--- a/media/baseset/CMakeLists.txt
+++ b/media/baseset/CMakeLists.txt
@@ -27,7 +27,6 @@ set(BASESET_OTHER_SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/route_step.grf
${CMAKE_CURRENT_SOURCE_DIR}/tracerestrict.grf
${CMAKE_CURRENT_SOURCE_DIR}/misc_gui.grf
- ${CMAKE_CURRENT_SOURCE_DIR}/road_waypoints.grf
)
if (UNIX AND NOT APPLE)
diff --git a/media/baseset/openttd.grf b/media/baseset/openttd.grf
index 7f4f6cbc49..6cee79959e 100644
Binary files a/media/baseset/openttd.grf and b/media/baseset/openttd.grf differ
diff --git a/media/baseset/openttd.grf.hash b/media/baseset/openttd.grf.hash
index 25a50247f5..f3b216de53 100644
--- a/media/baseset/openttd.grf.hash
+++ b/media/baseset/openttd.grf.hash
@@ -1 +1 @@
-4f03553f614a06d86dc06376db3353c7
+8bc3926cb50e19747de498357417d973
diff --git a/media/baseset/openttd/CMakeLists.txt b/media/baseset/openttd/CMakeLists.txt
index 30844b8804..ee93ba80b1 100644
--- a/media/baseset/openttd/CMakeLists.txt
+++ b/media/baseset/openttd/CMakeLists.txt
@@ -20,6 +20,7 @@ if(GRFCODEC_FOUND)
${CMAKE_CURRENT_SOURCE_DIR}/openttdgui.nfo
${CMAKE_CURRENT_SOURCE_DIR}/palette.nfo
${CMAKE_CURRENT_SOURCE_DIR}/roadstops.nfo
+ ${CMAKE_CURRENT_SOURCE_DIR}/road_waypoints.nfo
${CMAKE_CURRENT_SOURCE_DIR}/signals.nfo
${CMAKE_CURRENT_SOURCE_DIR}/sloped_tracks.nfo
${CMAKE_CURRENT_SOURCE_DIR}/tramtracks.nfo
@@ -42,6 +43,7 @@ if(GRFCODEC_FOUND)
${CMAKE_CURRENT_SOURCE_DIR}/openttdgui_convert_tram.png
${CMAKE_CURRENT_SOURCE_DIR}/openttdgui_group_livery.png
${CMAKE_CURRENT_SOURCE_DIR}/roadstops.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/road_waypoints.png
${CMAKE_CURRENT_SOURCE_DIR}/signals.png
${CMAKE_CURRENT_SOURCE_DIR}/sloped_tracks.png
${CMAKE_CURRENT_SOURCE_DIR}/tramtracks.png
diff --git a/media/baseset/openttd/openttd.nfo b/media/baseset/openttd/openttd.nfo
index c1ed751c55..3d59f08543 100644
--- a/media/baseset/openttd/openttd.nfo
+++ b/media/baseset/openttd/openttd.nfo
@@ -98,3 +98,4 @@
#include "mono.nfo"
#include "tunnel_portals.nfo"
#include "palette.nfo"
+#include "road_waypoints.nfo"
diff --git a/media/baseset/openttd/road_waypoints.nfo b/media/baseset/openttd/road_waypoints.nfo
new file mode 100644
index 0000000000..4e7a27019b
--- /dev/null
+++ b/media/baseset/openttd/road_waypoints.nfo
@@ -0,0 +1,14 @@
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
+//
+
+ -1 * 0 0C "Road waypoints"
+//@@LINT OFF
+ -1 * 3 05 19 04
+//@@LINT ON
+ -1 sprites/road_waypoints.png 8bpp 10 10 64 40 -5 -22 normal
+ -1 sprites/road_waypoints.png 8bpp 90 10 64 40 -31 -9 normal
+ -1 sprites/road_waypoints.png 8bpp 170 10 64 35 -31 -4 normal
+ -1 sprites/road_waypoints.png 8bpp 240 10 64 35 -57 -17 normal
diff --git a/media/baseset/road_waypoints/road_waypoints.png b/media/baseset/openttd/road_waypoints.png
similarity index 100%
rename from media/baseset/road_waypoints/road_waypoints.png
rename to media/baseset/openttd/road_waypoints.png
diff --git a/media/baseset/road_waypoints.grf b/media/baseset/road_waypoints.grf
deleted file mode 100644
index e4d2f0e3a4..0000000000
Binary files a/media/baseset/road_waypoints.grf and /dev/null differ
diff --git a/media/baseset/road_waypoints/road_waypoints.nfo b/media/baseset/road_waypoints/road_waypoints.nfo
deleted file mode 100644
index 669656ae22..0000000000
--- a/media/baseset/road_waypoints/road_waypoints.nfo
+++ /dev/null
@@ -1,10 +0,0 @@
-// Automatically generated by GRFCODEC. Do not modify!
-// (Info version 32)
-// Escapes: 2+ 2- 2< 2> 2u< 2u> 2/ 2% 2u/ 2u% 2* 2& 2| 2^ 2sto = 2s 2rst = 2r 2psto 2ror = 2rot 2cmp 2ucmp 2<< 2u>> 2>>
-// Escapes: 71 70 7= 7! 7< 7> 7G 7g 7gG 7GG 7gg 7c 7C
-// Escapes: D= = DR D+ = DF D- = DC Du* = DM D* = DnF Du<< = DnC D<< = DO D& D| Du/ D/ Du% D%
-// Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
- 0 road_waypoints.png 8bpp 10 10 64 40 -5 -22 normal
- 1 road_waypoints.png 8bpp 90 10 64 40 -31 -9 normal
- 2 road_waypoints.png 8bpp 170 10 64 35 -31 -4 normal
- 3 road_waypoints.png 8bpp 240 10 64 35 -57 -17 normal
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 498d83d0f1..90973acfd6 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -195,9 +195,6 @@ static void LoadSpriteTables()
/* Misc GUI sprites. */
LoadGrfFile("misc_gui.grf", SPR_MISC_GUI_BASE, false);
- /* Road waypoints sprites. */
- LoadGrfFile("road_waypoints.grf", SPR_ROAD_WAYPOINTS_BASE, false);
-
/* Fill duplicate original signal graphics sprite block */
for (uint i = 0; i < DUP_ORIGINAL_SIGNALS_SPRITE_COUNT; i++) {
DupSprite(SPR_ORIGINAL_SIGNALS_BASE + i, SPR_DUP_ORIGINAL_SIGNALS_BASE + i);
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index bc3992100b..73f38067f4 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -1188,6 +1188,13 @@ public:
}
}
+ void OnMouseWheel(int wheel) override
+ {
+ if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
+ DoZoomInOutWindow(wheel < 0 ? ZOOM_IN : ZOOM_OUT, this);
+ }
+ }
+
void OnQueryTextFinished(char *str) override
{
if (StrEmpty(str)) return;
@@ -1290,7 +1297,7 @@ void ShowIndustryViewWindow(int industry)
static constexpr NWidgetPart _nested_industry_directory_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
- NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_INDUSTRY_DIRECTORY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ NWidget(WWT_CAPTION, COLOUR_BROWN, WID_ID_CAPTION), SetDataTip(STR_INDUSTRY_DIRECTORY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_SHADEBOX, COLOUR_BROWN),
NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),
NWidget(WWT_STICKYBOX, COLOUR_BROWN),
@@ -1725,6 +1732,11 @@ public:
void SetStringParameters(WidgetID widget) const override
{
switch (widget) {
+ case WID_ID_CAPTION:
+ SetDParam(0, this->vscroll->GetCount());
+ SetDParam(1, Industry::GetNumItems());
+ break;
+
case WID_ID_DROPDOWN_CRITERIA:
SetDParam(0, IndustryDirectoryWindow::sorter_names[this->industries.SortType()]);
break;
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index bfe57ddbe8..d77af7790a 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -3090,7 +3090,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Gaan na
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Tik 'n naam vir die teken in
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Dorpe
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Geen -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Stad){BLACK} ({COMMA})
@@ -3374,7 +3373,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Stasiete
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Lughawens
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Nywerhede
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Geen -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% vervoer){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index f6667a4a95..1f6dda0dee 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -2940,7 +2940,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}توجة
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}ادخل اسم العلامة
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}مدن/ بلدات
STR_TOWN_DIRECTORY_NONE :{ORANGE}-بدون-
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{RLE}{TOWN}{BLACK} {RLM}({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{RLE}{TOWN}{YELLOW} (مدينة){BLACK} {RLM}({COMMA})
@@ -3206,7 +3205,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}مربع
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}المطارات
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}صناعات
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}-بدون-
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_ITEM_PROD1 :{ORANGE}{INDUSTRY} {STRING}
diff --git a/src/lang/basque.txt b/src/lang/basque.txt
index 72b5544f55..f78e8dd9df 100644
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -2919,7 +2919,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Joan aur
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Seinalearen izena sartu
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Herriak
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ezer ez -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Herri izenak - Klikatu izenean lehio nagusia bertan zentratzeko. Ktrl+Klik ikuspegi lehio berria irekiko du
@@ -3194,7 +3193,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Geltoki
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Aireportuak
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Idustriak
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ezer ez -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Industria izenak - Klikatu izenean ikuspegi nagusia industrian kokatzeko. Ktrl+Klik ikuspegi lehio berri bat irekitzen du industriaren kokapenarekin
diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt
index cb6b7d1b23..5079a67297 100644
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -3902,7 +3902,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Да п
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Увядзіце назву таблічкi
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Гарады
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Няма -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Мегаполіс){BLACK} ({COMMA})
@@ -4236,7 +4235,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/перыяд
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Прамысловасьць
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Няма -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% перавезена){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 6282cce7ea..c6de691177 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -624,14 +624,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Desativar tudo
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Mostrar todas as cargas no gráfico de tarifas por carga
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Não mostrar cargas no gráfico de tarifas por carga
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Mostrar/Ocultar gráfico para o tipo de carga
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Mostrar/Ocultar gráfico para este tipo de carga
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Mostrar avaliações detalhadas de desempenho
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Chave dos gráficos da empresa
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Clique aqui para mostrar/ocultar empresa no gráfico
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Mostrar/Ocultar esta empresa no gráfico
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tabela de Classificação das Empresas
@@ -711,7 +711,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Selecion
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Selecionar programa com músicas 'estilo Ezy Street'
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Selecionar programa 'Personalizado 1' (definido pelo usuário)
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Selecionar programa 'Personalizado 2' (definido pelo usuário)
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Ligar/Desligar reprodução aleatória
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Ligar/Desligar programa aleatório
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Mostrar janela de seleção de faixas de música
# Playlist window
@@ -794,7 +794,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Deserto
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Neve
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Mostrar nomes das localidades no mapa
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Mostrar nomes das localidades
STR_SMALLMAP_CENTER :{BLACK}Centralizar o minimapa na localização atual
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -803,9 +803,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Desativar tudo
STR_SMALLMAP_ENABLE_ALL :{BLACK}Ativar tudo
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Mostrar altitudes
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Mostrar nomes de indústrias
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Não mostrar indústrias no mapa
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Mostrar todas as indústrias no mapa
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Mostrar mapa de altitudes
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Mostrar nomes de indústrias
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Mostrar no mapa as propriedades que não pertencem às empresas
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Mostrar no mapa as propriedades de todas as empresas
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Não mostrar as cargas no mapa
@@ -2885,6 +2887,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Construi
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Construir linha de bonde usando o modo Autotrilho. Ctrl+Clique para remover seção da linha. Pressione também Shift para só mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construir depósito rodoviário (para compra e manutenção de veículos). Pressione também Shift para só mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construir depósito de bondes (para compra e manutenção de bondes). Pressione também Shift para só mostrar o custo estimado
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Construir ponto de controle na rodovia. Ctrl+Clique para selecionar outro ponto de controle e unir com este. Pressione também Shift para só mostrar o custo estimado
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Construir ponto de controle na linha de bonde. Ctrl+Clique para selecionar outro ponto de controle e unir com este. Pressione também Shift para só mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Construir estação de ônibus. Ctrl+Clique para selecionar outra estação e unir com esta. Pressione também Shift para só mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construir estação de bondes de passageiros. Ctrl+Clique para selecionar outra estação e unir com esta. Pressione também Shift para só mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Construir estação de caminhões. Ctrl+Clique para selecionar outra estação e unir com esta. Pressione também Shift para só mostrar o custo estimado
@@ -3617,7 +3621,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ir para
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Introduza um nome para a placa
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Localidades
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Localidades ({COMMA} of {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Nenhum -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Cidade){BLACK} ({COMMA})
@@ -3951,7 +3955,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/período
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Indústrias
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Indústrias ({COMMA} of {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nenhum -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportado){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5092,12 +5096,15 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST :{WHITE}Precisa
STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Adjacente a mais de um ponto de controle existente
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Muito perto de outro ponto de controle
-STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Não é possível construir ponto de controle de trem aqui...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Não é possível construir ponto de controle ferroviário aqui...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Não é possível construir ponto de controle rodoviário aqui...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Não é possível colocar boia aqui...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Não é possível alterar o nome do ponto de controle...
-STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Não é possível remover ponto de controle de trem aqui...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Não é possível remover ponto de controle ferroviário aqui...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Não é possível remover ponto de controle rodoviário aqui...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Precisa remover o ponto de controle ferroviário primeiro
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Precisa remover o ponto de controle rodoviário primeiro
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... boia no caminho
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... boia está em uso por outra empresa!
@@ -5345,6 +5352,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Não exi
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Este avião não pode pousar neste heliporto
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Este helicóptero não pode pousar neste aeroporto
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Não existe um ponto de controle ferroviário
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Não existe um ponto de controle na rodovia
STR_ERROR_NO_BUOY :{WHITE}Não existe uma boia
# Timetable related errors
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 755ca4454e..dac0807af3 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -3132,7 +3132,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Отид
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Въведете име за знакът
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Градове
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Отсъства -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Град){BLACK} ({COMMA})
@@ -3414,7 +3413,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Част
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Летища
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Индустрии
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Отсъства -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Имена на индустриите - натисни за да фокусираш върху индустрията. Ctrl+Click отваря нов прозорец на изглед върху индустрията.
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 12c13ae30d..bf05fccd6c 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -631,7 +631,7 @@ STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Mostra r
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Llegenda dels gràfics de la companyia
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Clica aquí per mostrar/amagar la companyia al gràfic
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Feu clic aquí per a mostrar/amagar la companyia al gràfic.
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Taula de la lliga de companyies
@@ -2885,6 +2885,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Construe
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Construeix seccions de tramvia amb el mode Autocarretera. Amb Ctrl+clic, es trauen les vies de tramvia en lloc de construir-les. Amb Maj, només es mostrarà el cost estimat de l'acció.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construeix una cotxera (per a comprar i revisar vehicles). Amb Maj, només es mostrarà el cost estimat de l'acció.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construeix cotxeres de tramvies (per a comprar i revisar tramvies). Amb Maj, només es mostrarà el cost estimat de l'acció.
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Construeix un punt de control de carretera. Amb Ctrl, es poden construir nous punts de control i ajuntar-los amb d'altres ja existents. Amb Maj, es mostrarà el cost estimat de construcció.
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Construeix un punt de control en tramvies. Amb Ctrl, es poden construir nous punts de control i ajuntar-los amb d'altres ja existents. Amb Maj, es mostrarà el cost estimat de construcció.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Construeix estacions d'autobús. Amb Ctrl, es poden ajuntar estacions. Amb Maj, se'n mostra el cost estimat.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construeix estacions de tramvia per a passatgers. Amb Ctrl, es poden ajuntar estacions. Amb Maj, se'n mostra el cost estimat.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Construeix una estació per a camions. Amb Ctrl, es poden ajuntar estacions. Amb Maj, se'n mostra el cost estimat.
@@ -3617,7 +3619,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Vés al
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Posa un nom al senyal
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Poblacions
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Poblacions ({COMMA} de {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Cap -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{BLACK} ({COMMA} -{YELLOW} ciutat{BLACK})
@@ -3951,7 +3953,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/període
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Indústries
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Indústries ({COMMA} de {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Cap -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} (transportat: {COMMA}{NBSP}%){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -4190,7 +4192,7 @@ STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} ve
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO_LONG} ({CARGO_SHORT})
###length VEHICLE_TYPES
-STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trens - arrossegueu el vehicle per a afegir-lo/treure'l del tren. Feu clic amb el botó dret al tren per a obtenir-ne informació. Amb Ctrl, s'apliquen les dues funcions a tota la cadena posterior.
+STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trens - arrossegueu el vehicle per a afegir-lo/traure'l del tren. Feu clic amb el botó dret al tren per a obtenir-ne informació. Amb Ctrl, s'apliquen les dues funcions a tota la cadena posterior.
STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Vehicles - clica amb el botó dret en un vehicle per més informació
STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Vaixells - clica amb el botó dret en un vaixell per més informació
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Avió - clica amb el botó dret sobre l'avió per més informació
@@ -4244,10 +4246,10 @@ STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centra l
STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc de l'hangar. Amb Ctrl+clic, s'obre una vista nova on hi ha l'hangar.
###length VEHICLE_TYPES
-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_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP :{BLACK}Mostra una llista de tots els trens que tinguin aquesta cotxera en alguna ordre.
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Mostra una llista de tots els vehicles que tinguin aquesta cotxera en alguna ordre.
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP :{BLACK}Mostra una llista de tots els vaixells que tinguin aquesta drassana en alguna ordre.
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP :{BLACK}Mostra una llista de tots els avions que tinguin algun hangar d'aquest aeroport en les seves ordres.
###length VEHICLE_TYPES
STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP :{BLACK}Clica per parar tots els trens de dins de la cotxera
@@ -5093,11 +5095,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Més d'u
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Massa prop d'un altre punt de control
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Aquí no es pot construir un punt de pas de tren...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Aquí no es pot construir un punt de pas de carretera...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Aquí no es pot situar una boia...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}No es pot canviar el nom del punt de pas...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Aquí no es pot treure un punt de pas de tren...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Aquí no es pot traure cap punt de pas de carretera...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}...abans s'ha de treure el punt de pas.
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}...abans s'ha de traure el punt de pas de carretera.
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... boia en el camí
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... boia en ús per una altra companyia!
@@ -5345,6 +5350,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}No hi ha
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}L'avió no pot aterrar en aquest aeroport
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}L'helicòpter no pot aterrar en aquest aeroport
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}No hi ha cap punt de pas ferroviari
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}No hi ha cap punt de control de carretera.
STR_ERROR_NO_BUOY :{WHITE}No hi ha cap boia
# Timetable related errors
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 158986a8fd..748929c37b 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -3264,7 +3264,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Idi do p
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Unesi ime znaka
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Gradovi
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ništa -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Grad){BLACK} ({COMMA})
@@ -3549,7 +3548,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Polje s
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Zračne luke
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrije
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ništa -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% prevezeno){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 12d62e999c..30bbcad19b 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -3661,7 +3661,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Na před
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Zadej název pro značku
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Města
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Nic -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (velkoměsto){BLACK} ({COMMA})
@@ -3995,7 +3994,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/období
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Průmysl
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nic -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% přepraveno){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 609d072db4..e568338994 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -3588,7 +3588,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Gå til
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Indtast et navn for skiltet
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Byer
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ingen -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (storby){BLACK} ({COMMA})
@@ -3922,7 +3921,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periode
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrier
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ingen -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transporteret){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 1742cefd06..8cf759a4b5 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -623,14 +623,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Alles uit
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Alle vrachtsoorten weergeven op de grafiek van vrachtprijzen
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Geen vrachtsoorten weergeven op de grafiek van vrachtprijzen
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Grafiek voor vrachttype aan-uit
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Grafiek voor dit vrachttype weergeven-verbergen
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Gedetailleerde prestatiescores weergeven
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Legenda voor bedrijfsgrafieken
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klik hier om dit bedrijf weer te geven of te verbergen op de grafiek
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Grafiek van dit bedrijf weergeven-verbergen
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Bedrijfsscoretabel
@@ -710,7 +710,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Selectee
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Selecteer het programma 'Ezy Street'
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Selecteer het programma 'Aangepast1'
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Selecteer het programma 'Aangepast2'
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Willekeurige volgorde aan-uit
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Willekeurige volgorde in-uitschakelen
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Venster voor muzieknummers weergeven
# Playlist window
@@ -793,7 +793,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Woestijn
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Sneeuw
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Plaatsnamen op de kaart weergeven-verbergen.
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Plaatsnamen weergeven-verbergen.
STR_SMALLMAP_CENTER :{BLACK}Kleine kaart centreren op huidige positie
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -802,9 +802,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Alles uitschakelen
STR_SMALLMAP_ENABLE_ALL :{BLACK}Alles inschakelen
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Hoogte weergeven
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Namen van industrieën weergeven
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Geen industrieën op de kaart weergeven
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Alle industrieën op de kaart weergeven
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Hoogtekaart weergeven-verbergen
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Namen van industrieën op de kaart weergeven-verbergen
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Verberg bedrijfseigendommen op de kaart
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Alle bedrijfseigendommen op de kaart weergeven
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Geen vrachtsoorten op de kaart weergeven
@@ -2884,6 +2886,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Wegen bo
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Bouw tramsporen met de Autotram-methode. Ctrl+klik om tramrails te verwijderen. Voeg Shift toe voor alleen inschatting van de kosten
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Garage bouwen (voor het kopen en onderhouden van wegvoertuigen). Voeg Shift toe voor alleen inschatting van de kosten
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Tramremise bouwen (voor het kopen en onderhouden van trams). Voeg Shift toe voor alleen inschatting van de kosten
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Routepunt bouwen op weg. Ctrl+klik om samen te voegen met ander routepunt. Voeg Shift toe voor alleen inschatting van de kosten
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Routepunt bouwen op trambaan. Ctrl+klik om samen te voegen met ander routepunt. Voeg Shift toe voor alleen inschatting van de kosten
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Busstation bouwen. Ctrl+klik om samen te voegen met ander station. Voeg Shift toe voor alleen inschatting van de kosten
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Passagierstramhalte bouwen. Ctrl+klik om samen te voegen met ander station. Voeg Shift toe voor alleen inschatting van de kosten
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Vrachtwagenstation bouwen. Ctrl+klik om samen te voegen met ander station. Voeg Shift toe voor alleen inschatting van de kosten
@@ -3616,7 +3620,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ga naar
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Geef een naam voor dit bord
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Steden
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Steden ({COMMA} van {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE} Geen
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (groeistad){BLACK} ({COMMA})
@@ -3950,7 +3954,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periode
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrielijst
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrieën ({COMMA} van {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE} Geen
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% vervoerd){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5092,11 +5096,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Ligt naa
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Te dicht bij een ander routepunt
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Kan hier geen routepunt bouwen...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Kan hier geen weg-routepunt bouwen...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Kan boei hier niet plaatsen...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Kan naam routepunt niet aanpassen...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Kan hier geen routepunt verwijderen...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Kan hier geen weg-routepunt verwijderen...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Routepunt moet eerst verwijderd worden
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Verwijder eerst het weg-routepunt
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... boei in de weg
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... boei is in gebruik door een ander bedrijf!
@@ -5344,6 +5351,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Er zijn
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Dit vliegtuig kan niet landen op dit heliplatform
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Deze helikopter kan niet landen op dit vliegveld
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Er is geen routepunt
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Er is geen weg-routepunt
STR_ERROR_NO_BUOY :{WHITE}Er is geen boei
# Timetable related errors
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 8acd054afe..75ffad4c95 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -623,14 +623,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Disable all
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Display all cargoes on the cargo payment rates graph
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Display no cargoes on the cargo payment rates graph
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle graph for cargo type on/off
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle graph of this cargo type
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
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_TOOLTIP :{BLACK}Click here to toggle company's entry on graph on/off
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Toggle graph of this company
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Company League Table
@@ -710,7 +710,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Select '
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Select 'Ezy Street style music' programme
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Select 'Custom 1' (user-defined) programme
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Select 'Custom 2' (user-defined) programme
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Toggle programme shuffle on/off
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Toggle programme shuffle
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Show music track selection window
# Playlist window
@@ -793,7 +793,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Desert
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Snow
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Toggle town names on/off on map
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Toggle display of town names
STR_SMALLMAP_CENTER :{BLACK}Centre the smallmap on the current position
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -802,9 +802,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Disable all
STR_SMALLMAP_ENABLE_ALL :{BLACK}Enable all
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Show height
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Show industry names
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Display no industries on the map
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Display all industries on the map
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Toggle display of heightmap
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Toggle display of industry names
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Display no company property on the map
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Display all company property on the map
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Display no cargoes on the map
@@ -2884,6 +2886,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Build ro
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Build tramway section using the Autotram mode. Ctrl+Click to remove tramway section. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Build road vehicle depot (for buying and servicing vehicles). Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Build tram vehicle depot (for buying and servicing vehicles). Also press Shift to show cost estimate only
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Build waypoint on road. Ctrl+Click to select another waypoint to join. Also press Shift to show cost estimate only
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Build waypoint on tramway. Ctrl+Click to select another waypoint to join. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Build bus station. Ctrl+Click to select another station to join. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Build passenger tram station. Ctrl+Click to select another station to join. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Build lorry station. Ctrl+Click to select another station to join. Also press Shift to show cost estimate only
@@ -3616,7 +3620,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Go to pr
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Enter a name for the sign
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Towns
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Towns ({COMMA} of {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- None -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (City){BLACK} ({COMMA})
@@ -3950,7 +3954,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/period
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries ({COMMA} of {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- None -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{RAW_STRING}{YELLOW} ({COMMA}% transported){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5092,11 +5096,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Adjoins
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Too close to another waypoint
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Can't build train waypoint here...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Can't build road waypoint here...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Can't place buoy here...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Can't change waypoint name...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Can't remove train waypoint here...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Can't remove road waypoint here...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Must remove rail waypoint first
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Must remove road waypoint first
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... buoy in the way
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... buoy is in use by another company!
@@ -5344,6 +5351,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}There ar
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}This plane cannot land at this heliport
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}This helicopter cannot land at this airport
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}There is no railway waypoint
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}There is no road waypoint
STR_ERROR_NO_BUOY :{WHITE}There is no buoy
# Timetable related errors
diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt
index a1a053558b..1eba93bc77 100644
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
@@ -623,14 +623,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Disable all
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Display all cargos on the cargo payment rates graph
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Display no cargos on the cargo payment rates graph
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle graph for cargo type on/off
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle graph of this cargo type
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
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_TOOLTIP :{BLACK}Click here to toggle company's entry on graph on/off
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Toggle graph of this company
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Company League Table
@@ -710,7 +710,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Select '
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Select 'Ezy Street style music' programme
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Select 'Custom 1' (user-defined) programme
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Select 'Custom 2' (user-defined) programme
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Toggle programme shuffle on/off
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Toggle program shuffle
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Show music track selection window
# Playlist window
@@ -793,7 +793,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Desert
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Snow
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Toggle town names on/off on map
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Toggle display of town names
STR_SMALLMAP_CENTER :{BLACK}Centre the small map on the current position
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -802,9 +802,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Disable all
STR_SMALLMAP_ENABLE_ALL :{BLACK}Enable all
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Show height
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Show industry names
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Display no industries on the map
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Display all industries on the map
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Toggle display of heightmap
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Toggle display of industry names
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Display no company property on the map
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Display all company property on the map
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Display no cargoes on the map
@@ -2884,6 +2886,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Build ro
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Build tramway section using the Autotram mode. Ctrl+Click to remove tramway section. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Build road vehicle depot (for buying and servicing vehicles). Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Build tram vehicle depot (for buying and servicing vehicles). Also press Shift to show cost estimate only
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Build waypoint on road. Ctrl+Click to select another waypoint to join. Also press Shift to show cost estimate only
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Build waypoint on tramway. Ctrl+Click to select another waypoint to join. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Build bus station. Ctrl+Click to select another station to join. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Build passenger tram station. Ctrl+Click to select another station to join. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Build lorry station. Ctrl+Click to select another station to join. Also press Shift to show cost estimate only
@@ -3616,7 +3620,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Go to pr
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Enter a name for the sign
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Towns
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Towns ({COMMA} of {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- None -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (City){BLACK} ({COMMA})
@@ -3950,7 +3954,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/period
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries ({COMMA} of {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- None -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transported){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5092,11 +5096,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Adjoins
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Too close to another waypoint
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Can't build train waypoint here...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Can't build road waypoint here...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Can't place buoy here...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Can't change waypoint name...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Can't remove train waypoint here...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Can't remove road waypoint here...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Must remove rail waypoint first
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Must remove road waypoint first
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... buoy in the way
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... buoy is in use by another company!
@@ -5344,6 +5351,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}There ar
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}This plane cannot land at this heliport
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}This helicopter cannot land at this airport
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}There is no railway waypoint
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}There is no road waypoint
STR_ERROR_NO_BUOY :{WHITE}There is no buoy
# Timetable related errors
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index e95e8505fd..f57292b236 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -623,14 +623,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Disable all
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Display all cargos on the cargo payment rates graph
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Display no cargos on the cargo payment rates graph
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle graph for cargo type on/off
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle graph of this cargo type
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
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_TOOLTIP :{BLACK}Click here to toggle company's entry on graph on/off
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Toggle graph of this company
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Company League Table
@@ -710,7 +710,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Select '
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Select 'Ezy Street style music' program
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Select 'Custom 1' (user-defined) program
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Select 'Custom 2' (user-defined) program
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Toggle program shuffle on/off
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Toggle program shuffle
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Show music track selection window
# Playlist window
@@ -793,7 +793,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Desert
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Snow
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Toggle town names on/off on map
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Toggle display of town names
STR_SMALLMAP_CENTER :{BLACK}Center the minimap on the current position
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -802,9 +802,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Disable all
STR_SMALLMAP_ENABLE_ALL :{BLACK}Enable all
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Show height
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Show industry names
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Display no industries on the map
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Display all industries on the map
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Toggle display of heightmap
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Toggle display of industry names
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Display no company property on the map
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Display all company property on the map
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Display no cargos on the map
@@ -2884,6 +2886,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Build ro
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Build streetcar section using the Autorail mode. Ctrl+Click to remove streetcar section. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Build road vehicle depot (for buying and maintaining vehicles). Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Build streetcar vehicle depot (for buying and maintaining vehicles). Also press Shift to show cost estimate only
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Build waypoint on road. Ctrl+Click to select another waypoint to join. Also press Shift to show cost estimate only
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Build waypoint on streetcar track. Ctrl+Click to select another waypoint to join. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Build bus station. Ctrl+Click to select another station to join. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Build passenger streetcar station. Ctrl+Click to select another station to join. Also press Shift to show cost estimate only
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Build truck station. Ctrl+Click to select another station to join. Also press Shift to show cost estimate only
@@ -3616,7 +3620,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Go to pr
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Enter a name for the sign
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Towns
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Towns ({COMMA} of {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- None -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (City){BLACK} ({COMMA})
@@ -3950,7 +3954,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/period
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries ({COMMA} of {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- None -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transported){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5092,11 +5096,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Adjoins
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Too close to another waypoint
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Can't build train waypoint here...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Can't build road waypoint here...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Can't place buoy here...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Can't change waypoint name...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Can't remove train waypoint here...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Can't remove road waypoint here...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Must remove rail waypoint first
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Must remove road waypoint first
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... buoy in the way
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... buoy is in use by another company!
@@ -5344,6 +5351,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}There ar
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}This plane cannot land at this heliport
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}This helicopter cannot land at this airport
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}There is no railroad waypoint
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}There is no road waypoint
STR_ERROR_NO_BUOY :{WHITE}There is no buoy
# Timetable related errors
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 33e89f6938..13eb7c3b12 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -3494,7 +3494,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Iri al l
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Enigu nomon por la signo
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Urboj
STR_TOWN_DIRECTORY_NONE :{ORANGE}-Neniu -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Urbego){BLACK} ({COMMA})
@@ -3810,7 +3809,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periodo
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrioj
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Neniu -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportiĝis){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 4a418ff0fc..1ec0f28c98 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -3650,7 +3650,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Mine eel
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Sisesta sildile nimi
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Asustused
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Puudub -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Linn){BLACK} ({COMMA})
@@ -3984,7 +3983,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/ajavahemik
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Tööstused
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Puudub -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% äraveetud){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/extra/czech.txt b/src/lang/extra/czech.txt
index 8a318c9acf..4c09b7650b 100644
--- a/src/lang/extra/czech.txt
+++ b/src/lang/extra/czech.txt
@@ -1065,9 +1065,6 @@ STR_ERROR_CANNOT_USE_SELF :{WHITE}Nelze ko
STR_ERROR_CAN_T_DEPEND_UPON_BIDIRECTIONAL_SIGNALS :{WHITE}Nelze podmíněně záviset na obousměrných návěstidlech
STR_ERROR_INVALID_SIGNAL :{WHITE}Neplatné návěstidlo
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Postavit na silnici směrovací bod. Ctrl zapíná spojování směrovacích bodů. Shift vyvolá zobrazení odhadu ceny
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Postavit na tramvajové trati směrovací bod. Ctrl zapíná spojování směrovacích bodů. Shift vyvolá zobrazení odhadu ceny
-
STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Vytvářet řeky
STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Použít virtuální pravítko pro měření vzdálenosti a výšky
@@ -1668,9 +1665,6 @@ STR_ERROR_BUILDING_IS_TOO_OLD :{WHITE}... budo
STR_ERROR_BUILDING_IS_TOO_MODERN :{WHITE}... budova je přílš moderní.
STR_ERROR_ONLY_ONE_BUILDING_ALLOWED_PER_TOWN :{WHITE}... ve městě je povolena pouze jedna budova tohoto typu.
STR_ERROR_TOO_MANY_DOCKS :{WHITE}Příliš mnoho přístavů
-STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Zde nelze postavit silniční směrovací bod...
-STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Nelze odebrat silniční směrovací bod...
-STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Je nutné nejprve odstranit silniční směrovací bod
STR_ERROR_UNSUITABLE_SIGNAL_TYPE :{WHITE}... nevhodný typ návěstidla
STR_ERROR_SIGNAL_CHANGES :{WHITE}Počet vyhodnocení programovatelných před-návěstidel překročil mez
@@ -1688,8 +1682,6 @@ STR_ERROR_DEPOT_HAS_WRONG_RAIL_TYPE :{WHITE}Depo nel
STR_ERROR_CANNOT_MODIFY_TRACK_TRAIN_APPROACHING :{WHITE}Blíží se vlak...
-STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Není zde žádný silniční směrovací bod
-
# Plan related errors
STR_ERROR_TOO_MANY_PLANS :{WHITE}... příliš mnoho plánů
STR_ERROR_TOO_MANY_NODES :{WHITE}... příliš mnoho uzlů v této plánové křivce
@@ -1971,8 +1963,6 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Nelze ko
STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}Nelze prodat podíl v této společnosti...
STR_ERROR_PROTECTED :{WHITE}Tato společnost zatím neobchoduje s akciemi...
-STR_TOWN_DIRECTORY_INFO :{BLACK}{STRING}, počet měst: {COMMA}
-
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR :{BLACK}Zvětšit hlavní lištu
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR_TOOLTIP :{BLACK}Zaškrtni pro zvětšení hlavní lišty nástrojů
diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt
index 295a6a41d7..18739eddf6 100644
--- a/src/lang/extra/english.txt
+++ b/src/lang/extra/english.txt
@@ -1231,9 +1231,6 @@ STR_ERROR_CANNOT_USE_SELF :{WHITE}Can't co
STR_ERROR_CAN_T_DEPEND_UPON_BIDIRECTIONAL_SIGNALS :{WHITE}Cannot conditionally depend upon bidirectional signals
STR_ERROR_INVALID_SIGNAL :{WHITE}Invalid signal
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Convert road to waypoint. Ctrl enables joining waypoints. Shift toggles building/showing cost estimate
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Convert tram to waypoint. Ctrl enables joining waypoints. Shift toggles building/showing cost estimate
-
STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Place rivers
STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Use a virtual ruler to measure distance and height
@@ -1926,9 +1923,6 @@ STR_ERROR_BUILDING_IS_TOO_OLD :{WHITE}... buil
STR_ERROR_BUILDING_IS_TOO_MODERN :{WHITE}... building is too modern.
STR_ERROR_ONLY_ONE_BUILDING_ALLOWED_PER_TOWN :{WHITE}... only one building of this type is allowed in a town.
STR_ERROR_TOO_MANY_DOCKS :{WHITE}Too many docks
-STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Can't build road waypoint here...
-STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Can't remove road waypoint here...
-STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Must remove road waypoint first
STR_ERROR_UNSUITABLE_SIGNAL_TYPE :{WHITE}... unsuitable signal type
STR_ERROR_RESTRICTED_SIGNAL :{WHITE}... signal has attached routing restriction program
STR_ERROR_SIGNAL_CHANGES :{WHITE}Number of programmable pre-signal evaluations exceeded limit
@@ -1947,8 +1941,6 @@ STR_ERROR_DEPOT_HAS_WRONG_RAIL_TYPE :{WHITE}Depot ca
STR_ERROR_CANNOT_MODIFY_TRACK_TRAIN_APPROACHING :{WHITE}Moving train approaching...
-STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}There is no road waypoint
-
# Plan related errors
STR_ERROR_TOO_MANY_PLANS :{WHITE}... too many plans
STR_ERROR_TOO_MANY_NODES :{WHITE}... too many nodes in plan line
@@ -2300,8 +2292,6 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Can't bu
STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}Can't sell 25% share in this company...
STR_ERROR_PROTECTED :{WHITE}This company is not old enough to trade shares yet...
-STR_TOWN_DIRECTORY_INFO :{BLACK}{STRING1}, Towns: {COMMA}
-
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR :{BLACK}Bigger main toolbar
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR_TOOLTIP :{BLACK}Check this box to increase the scale of the main toolbar
diff --git a/src/lang/extra/galician.txt b/src/lang/extra/galician.txt
index 1ac9f0db1f..f3a541f86e 100644
--- a/src/lang/extra/galician.txt
+++ b/src/lang/extra/galician.txt
@@ -1178,9 +1178,6 @@ STR_ERROR_CANNOT_USE_SELF :{WHITE}Non se p
STR_ERROR_CAN_T_DEPEND_UPON_BIDIRECTIONAL_SIGNALS :{WHITE}Non se pode condicionalmente depender de sinais bidirecionais
STR_ERROR_INVALID_SIGNAL :{WHITE}O sinal non é válido
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Convertir estrada en punto de ruta. Ctrl permite unir puntos de ruta. Shift alterna entre construír ou amosar o coste estimado
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Convertir tranvía en punto de ruta. Ctrl permite unir puntos de ruta. Shift alterna entre construír ou amosar o coste estimado
-
STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Colocar ríos
STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Usa unha regra virtual para medir a distancia e altura
@@ -1839,9 +1836,6 @@ STR_ERROR_BUILDING_IS_TOO_OLD :{WHITE}... a co
STR_ERROR_BUILDING_IS_TOO_MODERN :{WHITE}... a construción é demasiado moderna.
STR_ERROR_ONLY_ONE_BUILDING_ALLOWED_PER_TOWN :{WHITE}... só se permite unha construción deste tipo na localidade.
STR_ERROR_TOO_MANY_DOCKS :{WHITE}Demasiados portos
-STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Non se pode construír un punto de ruta de estrada aqui...
-STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Non se pode eliminar o punto de ruta aqui...
-STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Debes eliminar o punto de ruta de estrada primeiro
STR_ERROR_UNSUITABLE_SIGNAL_TYPE :{WHITE}... tipo de sinal non axeitado
STR_ERROR_RESTRICTED_SIGNAL :{WHITE}... o sinal ten un programa de restrición de ruta adxunto
STR_ERROR_SIGNAL_CHANGES :{WHITE}O número de avaliacións de pre-sinais programables excedeu o límite.
@@ -1860,8 +1854,6 @@ STR_ERROR_DEPOT_HAS_WRONG_RAIL_TYPE :{WHITE}O depós
STR_ERROR_CANNOT_MODIFY_TRACK_TRAIN_APPROACHING :{WHITE}Achegándose tren en movemento...
-STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Non hai punto de ruta de estrada...
-
# Plan related errors
STR_ERROR_TOO_MANY_PLANS :{WHITE}... demasiados avións
STR_ERROR_TOO_MANY_NODES :{WHITE}... demasiados nodos na liña do plano
@@ -2208,8 +2200,6 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Non se p
STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}Non se pode vender un 25% das accións desta compañía...
STR_ERROR_PROTECTED :{WHITE}Esta compañía aínda non é suficientemente antiga para comerciar con accións...
-STR_TOWN_DIRECTORY_INFO :{BLACK}{STRING}, Vilas: {COMMA}
-
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR :{BLACK}Barra de ferramentas principal máis grande
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR_TOOLTIP :{BLACK}Marca esta caixa para aumentar a escala da barra de ferramentas principal
diff --git a/src/lang/extra/german.txt b/src/lang/extra/german.txt
index 863548ab28..4ae3081779 100644
--- a/src/lang/extra/german.txt
+++ b/src/lang/extra/german.txt
@@ -969,9 +969,6 @@ STR_ERROR_CANNOT_USE_SELF :{WHITE}Kann kei
STR_ERROR_CAN_T_DEPEND_UPON_BIDIRECTIONAL_SIGNALS :{WHITE}Kann nicht bedingt von einem bidirektionalen Signal abhängen
STR_ERROR_INVALID_SIGNAL :{WHITE}Ungültiges Signal
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Wandle Straße in Wegpunkt um. Strg aktiviert das Verbinden von Wegpunkten. Umschalt schaltet zwischen Bauen und Kostenvoranschlag um
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Wandle Straßenbahngleis in Wegpunkt um. Strg aktiviert das Verbinden von Wegpunkten. Umschalt schaltet zwischen Bauen und Kostenvoranschlag um
-
STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Flüsse platzieren
STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Benutze einen virtuellen Zollstock, um Entfernung und Höhe zu messen
@@ -1491,9 +1488,6 @@ STR_ERROR_BUILDING_IS_TOO_OLD :{WHITE}... Geb
STR_ERROR_BUILDING_IS_TOO_MODERN :{WHITE}... Gebäude ist zu modern
STR_ERROR_ONLY_ONE_BUILDING_ALLOWED_PER_TOWN :{WHITE}... nur ein Gebäude dieses Typs ist in einer Stadt erlaubt
STR_ERROR_TOO_MANY_DOCKS :{WHITE}Zu viele Docks
-STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Wegpunkt kann hier nicht gebaut werden...
-STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Wegpunkt kann hier nicht entfernt werden...
-STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Wegpunkt muss erst abgerissen werden
STR_ERROR_UNSUITABLE_SIGNAL_TYPE :{WHITE}... ungeeignete Signalart
STR_ERROR_SIGNAL_CHANGES :{WHITE}Anzahl der Auswertungen von programmierbaren Signalen übersteigt das Limit
@@ -1511,8 +1505,6 @@ STR_ERROR_DEPOT_HAS_WRONG_RAIL_TYPE :{WHITE}Depot ka
STR_ERROR_CANNOT_MODIFY_TRACK_TRAIN_APPROACHING :{WHITE}Herannahneder Zug ...
-STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Da ist kein Wegpunkt ...
-
# Plan related errors
STR_ERROR_TOO_MANY_PLANS :{WHITE}... zu viele Pläne
STR_ERROR_TOO_MANY_NODES :{WHITE}... zu viele Segmente in geplanter Strecke
diff --git a/src/lang/extra/korean.txt b/src/lang/extra/korean.txt
index ae20f19ffe..dc7ee78274 100644
--- a/src/lang/extra/korean.txt
+++ b/src/lang/extra/korean.txt
@@ -1181,9 +1181,6 @@ STR_ERROR_CANNOT_USE_SELF :{WHITE}자신
STR_ERROR_CAN_T_DEPEND_UPON_BIDIRECTIONAL_SIGNALS :{WHITE}양방향 신호기를 설정할 수 없습니다.
STR_ERROR_INVALID_SIGNAL :{WHITE}유효하지 않은 신호기
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}도로에 경유지를 건설합니다. CTRL 키를 사용하면 근처 경유지와 연결할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}전찻길에 경유지를 건설합니다. CTRL 키를 사용하면 근처 경유지와 연결할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
-
STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}강 만들기
STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}거리와 고도를 측정하기 위한 가상의 자를 사용합니다.
@@ -1871,9 +1868,6 @@ STR_ERROR_BUILDING_IS_TOO_OLD :{WHITE}... 건
STR_ERROR_BUILDING_IS_TOO_MODERN :{WHITE}... 아직 건물을 지을 수 없습니다.
STR_ERROR_ONLY_ONE_BUILDING_ALLOWED_PER_TOWN :{WHITE}... 이 종류의 건물은 오직 하나만 지을 수 있습니다.
STR_ERROR_TOO_MANY_DOCKS :{WHITE}항구가 너무 많습니다!
-STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}여기에 도로 경유지를 설치할 수 없습니다...
-STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}이 도로 경유지를 제거할 수 없습니다...
-STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}도로 경유지를 먼저 제거하십시오
STR_ERROR_UNSUITABLE_SIGNAL_TYPE :{WHITE}... 적절하지 않은 신호기 종류입니다
STR_ERROR_RESTRICTED_SIGNAL :{WHITE}... 신호기에 경로 제한 프로그램이 있습니다
STR_ERROR_SIGNAL_CHANGES :{WHITE}프로그램 신호기가 한 번에 바꿀 수 있는 제한 횟수를 넘어섰습니다.
@@ -1892,8 +1886,6 @@ STR_ERROR_DEPOT_HAS_WRONG_RAIL_TYPE :{WHITE}이 선
STR_ERROR_CANNOT_MODIFY_TRACK_TRAIN_APPROACHING :{WHITE}움직이는 열차가 접근 중입니다...
-STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}도로 경유지가 없습니다...
-
# Plan related errors
STR_ERROR_TOO_MANY_PLANS :{WHITE}... 계획 수가 너무 많습니다
STR_ERROR_TOO_MANY_NODES :{WHITE}... 계획이 너무 많은 선으로 이뤄졌습니다
@@ -2242,8 +2234,6 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}이 회
STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}이 회사 지분의 25%를 매도할 수 없습니다...
STR_ERROR_PROTECTED :{WHITE}이 회사는 지분을 거래할 수 있을 만큼 오래되지 않았습니다...
-STR_TOWN_DIRECTORY_INFO :{BLACK}{STRING}, 도시: {COMMA}
-
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR :{BLACK}큰 메인 메뉴
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR_TOOLTIP :{BLACK}메인 메뉴의 크기를 키우려면 이 항목에 체크하세요
diff --git a/src/lang/extra/russian.txt b/src/lang/extra/russian.txt
index 0b073ab0b5..db68fbce70 100644
--- a/src/lang/extra/russian.txt
+++ b/src/lang/extra/russian.txt
@@ -1181,9 +1181,6 @@ STR_ERROR_CANNOT_USE_SELF :{WHITE}Нево
STR_ERROR_CAN_T_DEPEND_UPON_BIDIRECTIONAL_SIGNALS :{WHITE}Не может условно зависеть от двунаправленных сигналов
STR_ERROR_INVALID_SIGNAL :{WHITE}Недопустимый сигнал
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Преобразовать дорогу в маршрутную точку. Ctrl включает соединение маршрутных точек. Shift переключает построение/показ сметы расходов
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Преобразовать трамвайный путь в маршрутную точку. Ctrl включает соединение маршрутных точек. Shift переключает построение/показ сметы расходов
-
STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Разместить реки
STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Использовать виртуальную линейку для измерения расстояния и высоты
@@ -1872,9 +1869,6 @@ STR_ERROR_BUILDING_IS_TOO_OLD :{WHITE}... зд
STR_ERROR_BUILDING_IS_TOO_MODERN :{WHITE}... здание слишком новое.
STR_ERROR_ONLY_ONE_BUILDING_ALLOWED_PER_TOWN :{WHITE}... в городе разрешено только одно здание такого типа.
STR_ERROR_TOO_MANY_DOCKS :{WHITE}Слишком много доков
-STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Невозможно построить здесь дорожную маршрутную точку...
-STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Невозможно удалить дорожную маршрутную точку здесь...
-STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Сначала необходимо удалить дорожную маршрутную точку
STR_ERROR_UNSUITABLE_SIGNAL_TYPE :{WHITE}... неподходящий тип сигнала
STR_ERROR_RESTRICTED_SIGNAL :{WHITE}... сигнал прикреплён программу ограничения маршрутизации
STR_ERROR_SIGNAL_CHANGES :{WHITE}Превышен предел количество программируемых пресигналов
@@ -1893,8 +1887,6 @@ STR_ERROR_DEPOT_HAS_WRONG_RAIL_TYPE :{WHITE}Депо
STR_ERROR_CANNOT_MODIFY_TRACK_TRAIN_APPROACHING :{WHITE}Приближается поезд...
-STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Отсутствует дорожная маршрутная точка
-
# Plan related errors
STR_ERROR_TOO_MANY_PLANS :{WHITE}... слишком много планов
STR_ERROR_TOO_MANY_NODES :{WHITE}... слишком много узлов в линии плана
@@ -2243,8 +2235,6 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Нево
STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}Невозможно продать 25% акций этой компании...
STR_ERROR_PROTECTED :{WHITE}Эта компания ещё не выпускает акции...
-STR_TOWN_DIRECTORY_INFO :{BLACK}{STRING}, Города: {COMMA}
-
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR :{BLACK}Увеличенная главная панель инструментов
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR_TOOLTIP :{BLACK}Установите этот флажок, чтобы увеличить масштаб главной панели инструментов
diff --git a/src/lang/extra/simplified_chinese.txt b/src/lang/extra/simplified_chinese.txt
index 52914c2d79..374653d7eb 100644
--- a/src/lang/extra/simplified_chinese.txt
+++ b/src/lang/extra/simplified_chinese.txt
@@ -1180,9 +1180,6 @@ STR_ERROR_CANNOT_USE_SELF :{WHITE}不能
STR_ERROR_CAN_T_DEPEND_UPON_BIDIRECTIONAL_SIGNALS :{WHITE}不能有条件地依赖于双向信号
STR_ERROR_INVALID_SIGNAL :{WHITE}无效信号
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}在道路上建设路点{}按住 Ctrl 键加入路点。按住 Shift 键显示费用
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}在电车道上建设路点{}按住 Ctrl 键加入路点。按住 Shift 键显示费用
-
STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}放置河流
STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}使用虚拟直尺来测量距离和高度差
@@ -1844,9 +1841,6 @@ STR_ERROR_BUILDING_IS_TOO_OLD :{WHITE}……
STR_ERROR_BUILDING_IS_TOO_MODERN :{WHITE}……此建筑太新了
STR_ERROR_ONLY_ONE_BUILDING_ALLOWED_PER_TOWN :{WHITE}……此建筑在一个城镇里最多只允许存在一个
STR_ERROR_TOO_MANY_DOCKS :{WHITE}船坞太多了
-STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}不能在这里建立道路路点
-STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}不能在这里拆除道路路点
-STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}必须先拆除道路路点
STR_ERROR_UNSUITABLE_SIGNAL_TYPE :{WHITE}……不适合的信号类型
STR_ERROR_RESTRICTED_SIGNAL :{WHITE}……信号已配置寻路限制程序
STR_ERROR_SIGNAL_CHANGES :{WHITE}可编程逻辑信号评估次数超过限制
@@ -1865,8 +1859,6 @@ STR_ERROR_DEPOT_HAS_WRONG_RAIL_TYPE :{WHITE}车库
STR_ERROR_CANNOT_MODIFY_TRACK_TRAIN_APPROACHING :{WHITE}列车已占用此轨道……
-STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}这里没有道路路点……
-
# Plan related errors
STR_ERROR_TOO_MANY_PLANS :{WHITE}……计划太多了
STR_ERROR_TOO_MANY_NODES :{WHITE}……计划中线段的节点太多了
@@ -2215,8 +2207,6 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}不能
STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}不能出售此公司的股份……
STR_ERROR_PROTECTED :{WHITE}这个公司刚刚开业，还不能进行股权交易……
-STR_TOWN_DIRECTORY_INFO :{BLACK}{STRING}，城镇：{COMMA}
-
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR :{BLACK}更大的主工具栏
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR_TOOLTIP :{BLACK}增加主工具栏的大小
diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt
index 2896a990df..8964c9b2d9 100644
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
@@ -2697,7 +2697,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Far til
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Skriva eitt navn fyri skelti
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Bygdir
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ongar -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Bygda nøvn - trýst á eitt navn fyri at savna høvuðs sýni á bygdina. Ctrl+trýst letur upp ein nýggjan sýnisglugga á bygdina
@@ -2938,7 +2937,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Støð p
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Floghavnir
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Ídnaðir
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Einki -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Ídnaðar nøvn - trýst á eitt navn fyri at savna høvuðs sýni á ídnað. Ctrl+trýst letur ein nýggjan sýnisglugga upp á ídnaðin
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index d3b98a04bf..79bbebfc28 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -623,14 +623,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Poista kaikki käytöstä
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Näytä kaikki rahdit rahtitaksojen kaaviossa
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Älä näytä mitään rahteja rahtitaksojen kaaviossa
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Rahtityypin kuvaaja päälle/pois
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Valitse, näytetäänkö tämän rahdin kuvaaja
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Näytä tarkat suorituskykyarviot
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Selite yhtiön kuvaajiin
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Napsauta tätä vaihtaaksesi yhtiön merkinnän kuvaajassa päälle/pois
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Valitse, näytetäänkö tämän yhtiön kuvaaja
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Yhtiökilpataulukko
@@ -710,7 +710,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Valitse
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Valitse ”Ezy Street” -tyylin musiikki
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Valitse ”oma 1” (käyttäjän määritettävissä)
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Valitse ”oma 2” (käyttäjän määritettävissä)
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Sekoittaminen päälle/pois
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Valitse, sekoitetaanko soittojärjestys
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Näytä musiikkiraitojen valintaikkuna
# Playlist window
@@ -793,7 +793,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Aavikko
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Lunta
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Näytä kuntien nimet kartalla
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Valitse, näytetäänkö kuntien nimet
STR_SMALLMAP_CENTER :{BLACK}Keskitä pieni kartta tähän paikkaan
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -802,9 +802,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Kaikki pois päältä
STR_SMALLMAP_ENABLE_ALL :{BLACK}Kaikki päälle
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Näytä korkeus
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Näytä laitosten nimet
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Älä näytä teollisuuslaitoksia kartalla
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Näytä kaikki teollisuuslaitokset kartalla
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Valitse, näytetäänkö korkeuskartta
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Valitse, näytetäänkö teollisuuslaitosten nimet
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Älä näytä yhtiöiden omaisuutta kartalla
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Näytä kaikki yhtiöiden omaisuus kartalla
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Älä näytä mitään rahtia kartalla
@@ -2772,7 +2774,7 @@ STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION :Maglevin rakent
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Rakenna rautatietä. Ctrl+napsautus poistaa rautatietä. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL :{BLACK}Rakenna rautatietä automaattisesti valittuun suuntaan. Ctrl+napsautus poistaaksesi rautatietä. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Rakenna junavarikko (junien ostamista ja huoltoa varten). Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Rakenna reittipiste rautatielle. Ctrl+napsautus valitsee toisen reittipisteen, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion.
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Rakenna reittipiste rautatielle. Ctrl+napsautus valitsee toisen reittipisteen, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION :{BLACK}Rakenna rautatieasema. Ctrl+napsautus valitsee toisen aseman, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Rakenna opastin rautatielle. Ctrl+napsautus rakentaa vaihtoehtoista opastintyyliä{}Napsautus+veto täyttää valitun rataosuuden opastimilla määrätyin välein. Ctrl+napsautus+veto täyttää seuraavaan risteykseen, asemaan tai opastimeen asti. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Rakenna rautatiesilta. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
@@ -2884,10 +2886,12 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Rakenna
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Rakenna raitiotieosuus automaattisesti valittuun suuntaan. Ctrl+napsautus poistaa raitiotieosuuden. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Rakenna ajoneuvovarikko (ajoneuvojen ostamista ja huoltoa varten). Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Rakenna raitiovaunuvarikko (vaunujen ostamista ja huoltoa varten). Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Rakenna tielle reittipiste. Ctrl+napsautus valitsee toisen reittipisteen, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Rakenna reittipiste raitiotielle. Ctrl+napsautus valitsee toisen reittipisteen, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Rakenna linja-autoasema. Ctrl+napsautus valitsee toisen aseman, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Rakenna raitiotien matkustaja-asema. Ctrl+napsautus valitsee toisen aseman, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Rakenna lastauslaituri. Ctrl+napsautus valitsee toisen aseman, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion.
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION :{BLACK}Rakenna raitiotien rahtiasema. Ctrl+napsautus valitaksesi toisen aseman, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion.
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Rakenna lastauslaituri. Ctrl+napsautus valitsee toisen aseman, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION :{BLACK}Rakenna raitiotien rahtiasema. Ctrl+napsautus valitaksesi toisen aseman, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD :{BLACK}Ota yksisuuntaiset tiet käyttöön/pois käytöstä
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE :{BLACK}Rakenna maantiesilta. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE :{BLACK}Rakenna raitiotiesilta. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion.
@@ -2938,7 +2942,7 @@ STR_STATION_BUILD_DOCK_CAPTION :{WHITE}Satama
# Airport toolbar
STR_TOOLBAR_AIRCRAFT_CAPTION :{WHITE}Lentokentät
-STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Rakenna lentokenttä. Ctrl+napsautus valitsee toisen aseman, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion.
+STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Rakenna lentokenttä. Ctrl+napsautus valitsee toisen aseman, johon haluat tämän liitettävän. Paina lisäksi vaihtonäppäintä nähdäksesi vain kustannusarvion
# Airport construction window
STR_STATION_BUILD_AIRPORT_CAPTION :{WHITE}Lentokentän valinta
@@ -3616,7 +3620,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Siirry e
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Syötä kyltin nimi
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Kunnat
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Kunnat ({COMMA}/{COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ei mitään -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (kaupunki){BLACK} ({COMMA})
@@ -3835,7 +3839,7 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP :{BLACK}Estä il
STR_WAYPOINT_VIEW_CAPTION :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä reittipisteen sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan reittipisteen sijaintiin.
STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}Muuta reittipisteen nimeä
-STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä poijun sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan poijun sijaintiin.
+STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä poijun sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan poijun sijaintiin
STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}Vaihda poijun nimeä
STR_EDIT_WAYPOINT_NAME :{WHITE}Muokkaa reittipisteen nimeä
@@ -3950,7 +3954,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/jakso
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Teollisuuslaitokset
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Laitokset ({COMMA}/{COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ei mitään -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% kuljetettu){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -3958,7 +3962,7 @@ STR_INDUSTRY_DIRECTORY_ITEM_PROD1 :{ORANGE}{INDUST
STR_INDUSTRY_DIRECTORY_ITEM_PROD2 :{ORANGE}{INDUSTRY} {STRING}, {STRING}
STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} ja {NUM} muuta
-STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Teollisuushaarojen nimet – kohdista päänäkymä tuotantolaitokseen napsauttamalla nimeä. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen sijaintiin.
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Teollisuushaarojen nimet – kohdista päänäkymä tuotantolaitokseen napsauttamalla nimeä. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen sijaintiin
STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER :{BLACK}Vastaanotettava rahti: {SILVER}{STRING}
STR_INDUSTRY_DIRECTORY_PRODUCED_CARGO_FILTER :{BLACK}Tuotettu rahti: {SILVER}{STRING}
STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES :Kaikki rahtityypit
@@ -3969,7 +3973,7 @@ STR_INDUSTRY_VIEW_CAPTION :{WHITE}{INDUSTR
STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Tuotanto viime kuussa:
STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE :{BLACK}Tuotanto viime minuutissa:
STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}{NBSP}% kuljetettu)
-STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä tuotantolaitoksen sijaintiin. Ctrl+napsautus avataksesi uuden näkymäikkunan laitoksen sijaintiin.
+STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä tuotantolaitoksen sijaintiin. Ctrl+napsautus avataksesi uuden näkymäikkunan laitoksen sijaintiin
STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Tuotantotaso: {YELLOW}{COMMA}{NBSP}%
STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}Teollisuuslaitos ilmoittaa välittömästä lakkautuksesta!
@@ -4238,9 +4242,9 @@ STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Osta ilm
###length VEHICLE_TYPES
STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä veturitallin sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan veturitallin sijaintiin
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä ajoneuvovarikon sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan varikon sijaintiin.
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä ajoneuvovarikon sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan varikon sijaintiin
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä telakan sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan telakan sijaintiin
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä lentokonehallin sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan lentokonehallin sijaintiin.
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä lentokonehallin sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan lentokonehallin sijaintiin
###length VEHICLE_TYPES
STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP :{BLACK}Näytä tällä asemalla olevien junien käskyt
@@ -4346,10 +4350,10 @@ STR_REPLACE_REMOVE_WAGON_GROUP_HELP :{STRING}. Ctrl+
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä junan sijaintiin. Kaksoisnapsauta seurataksesi junaa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan junan sijaintiin.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä ajoneuvon sijaintiin. Kaksoisnapsauta seurataksesi ajoneuvoa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan ajoneuvon sijaintiin.
-STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä laivan sijaintiin. Kaksoisnapsauta seurataksesi laivaa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan laivan sijaintiin.
-STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä ilma-aluksen sijaintiin. Kaksoisnapsauta seurataksesi ilma-alusta päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan ilma-aluksen sijaintiin.
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä junan sijaintiin. Kaksoisnapsauta seurataksesi junaa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan junan sijaintiin
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä ajoneuvon sijaintiin. Kaksoisnapsauta seurataksesi ajoneuvoa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan ajoneuvon sijaintiin
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä laivan sijaintiin. Kaksoisnapsauta seurataksesi laivaa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan laivan sijaintiin
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä ilma-aluksen sijaintiin. Kaksoisnapsauta seurataksesi ilma-alusta päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan ilma-aluksen sijaintiin
###length VEHICLE_TYPES
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä juna veturitalliin. Ctrl+napsautus suorittaa vain huollon.
@@ -5092,11 +5096,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Vieress
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Liian lähellä toista reittipistettä
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Junien reittipistettä ei voi rakentaa tähän...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Tien reittipistettä ei voi rakentaa tähän…
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Poijua ei voi sijoittaa tähän...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Reittipisteen nimeä ei voi muuttaa...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Junien reittipistettä ei voi poistaa...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Tien reittipistettä ei voi poistaa tästä…
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Rautatien reittipiste täytyy poistaa ensin
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Tien reittipiste täytyy poistaa ensin
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... poiju on tiellä
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... poiju on toisen yhtiön käytössä!
@@ -5344,6 +5351,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Ei ole n
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Tämä lentokone ei voi laskeutua tälle helikopterikentälle
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Tämä helikopteri ei voi laskeutua tälle lentokentälle
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Rautatien reittipistettä ei ole
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Tien reittipistettä ei ole
STR_ERROR_NO_BUOY :{WHITE}Poijua ei ole
# Timetable related errors
diff --git a/src/lang/french.txt b/src/lang/french.txt
index e4d2443029..8065aafd76 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -3617,7 +3617,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Aller au
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Entrer un nom pour le panneau
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Villes
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Villes ({COMMA} sur {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}− Aucune −
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Métropole){BLACK} ({COMMA})
@@ -3951,7 +3951,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/période
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries ({COMMA} sur {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}− Aucune −
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transporté{P "" s}){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt
index 82eb99b6ef..70582ec9b4 100644
--- a/src/lang/frisian.txt
+++ b/src/lang/frisian.txt
@@ -2889,7 +2889,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Gean ne
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Fier in namme yn foar it boerd
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Stêden
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Gjin -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Stêdsnammen - klik op de namme om it byld op dy stêd te sintrearen. Ctrl+klick iepent in nij sichtber diel op de stêd lokaasje
@@ -3157,7 +3156,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Stasjont
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Fleanfjilden
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Yndustryen
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Gjin -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt
index 92baa04552..a57a1c4880 100644
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -3277,7 +3277,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Rach dha
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Cuir a-steach ainm airson an t-sanais
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Bailtean
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Chan eil gin -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Ainmean nam bailtean - briog air ainm gus am prìomh-shealladh a mheadhanachadh air a' bhaile. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad a' bhaile
@@ -3556,7 +3555,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Leacan s
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Puirt-adhair
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Gnìomhachasan
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Gun ghnìomhachas -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Ainmean nan gnìomhachasan - briog air an ainm gus am prìomh-shealladh a mheadhanachadh air a' ghnìomhachais. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad a' ghnìomhachais
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 4b436aaeff..1f123d25f8 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -631,7 +631,7 @@ STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Amosar p
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Lenda das gráficas da compañía
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Pincha aquí para amosar/ocultar a entrada da compañía na gráfica
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Amosar/ocultar o gráfico desta compañía
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Cadro da liga de compañías
@@ -794,7 +794,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Deserto
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Neve
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Amosar/ocultar nomes das cidades no mapa
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Amosar/ocultar nomes das vilas no mapa
STR_SMALLMAP_CENTER :{BLACK}Centrar o minimapa na posición actual
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -803,9 +803,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Desactivar todo
STR_SMALLMAP_ENABLE_ALL :{BLACK}Activar todo
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Mostrar cota
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Amosar nomes das industrias
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Non mostrar industrias no mapa
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Mostrar tódalas industrias no mapa
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Amosar/ocultar mapa de cotas do terreo
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Alternar a visibilidade dos nomes das industrias
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Non amosar as propiedades de ningunha compañía no mapa
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Amosar as propiedades de tódalas compañías no mapa
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Non amosa ningunha carga no mapa
@@ -2885,6 +2887,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Constru
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Construír sección de tranvía usando o modo Auto-tranvía. Ctrl+Click para eliminar o tranvía. Tamén podes premer Shift para amosar unha estimación do custo
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construír depósito de vehículos de estrada (para comprar e dar servizo aos vehículos de estrada). Tamén podes premer Shift para amosar unha estimación do custo
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construír depósito de tranvías (para comprar e dar servizo aos vehículos). Tamén podes premer Shift para amosar unha estimación do custo
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Construír un punto de ruta na estrada. Ctrl+Click para seleccionar outro punto de ruta ao que xuntalo. Tamén podes premer Shift para amosar unha estimación do custo
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Construír un punto de ruta no tranvía. Ctrl+Click para seleccionar outro punto de ruta ao que xuntalo. Tamén podes premer Shift para amosar unha estimación do custo
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Construír estación de autobuses. Ctrl+Clic para seleccionar outra estación a que xuntala. Tamén podes premer Shift para amosar unha estimación do custo
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construír estación de tranvía de pasaxeiros. Ctrl+Clic para seleccionar outra estación a que xuntala. Tamén podes premer Shift para amosar unha estimación do custo
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Construír estación de carga de camións. Ctrl+Clic para seleccionar outra estación a que xuntala. Tamén podes premer Shift para amosar unha estimación do custo
@@ -3617,7 +3621,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ir ao r
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Escribe un nome para o rótulo
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Cidades
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Vilas ({COMMA} de {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ningunha -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Vila){BLACK} ({COMMA})
@@ -3951,7 +3955,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/período
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrias
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrias ({COMMA} de {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ningunha -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportado){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5093,11 +5097,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Une mái
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Demasiado preto doutro punto de ruta
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Non se pode construír un punto ruta de tren aí...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Non se poden construír puntos de ruta de estrada aquí...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Non se pode coloca-la boia aquí...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Non se pode cambia-lo nome do punto de ruta...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Non se pode eliminar-lo punto de ruta aquí...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Non se pode eliminar o punto de ruta da estrada de aquí...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Débese retirar primeiro o punto de ruta para trenes
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Debes eliminar o punto de ruta da estrada primeiro
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... boia no camiño
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... a boia está en uso por outra compañía!
@@ -5345,6 +5352,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Non hai
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Este avión non pode aterrar neste heliporto
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Este helicóptero non pode aterrar neste aeroporto
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Non hai punto de ruta da liña férrea
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Non hai punto de ruta na estrada
STR_ERROR_NO_BUOY :{WHITE}Non hai boia
# Timetable related errors
diff --git a/src/lang/german.txt b/src/lang/german.txt
index cc4459a2eb..446cc21979 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -3617,7 +3617,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Zum vorh
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Text für dieses Schild eingeben
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Städte
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Keine -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Großstadt){BLACK} ({COMMA})
@@ -3951,7 +3950,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/Zyklus
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrien
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Keine -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportiert){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 19283c6e94..3f0739009d 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -716,14 +716,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Απενεργοποιήση όλων
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Εμφάνιση όλων των εμπορευμάτων στο γράφημα πληρωμής εμπορευμάτων
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Εμφάνιση κανενός εμπορευμάτος στο γράφημα πληρωμής εμπορευμάτων
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Εναλλαγή γραφήματος τύπου φορτίου
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Εναλλαγή γραφήματος αυτού του τύπου φορτίου
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Εμφάνιση λεπτομεριών αποδόσεων
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Γραφήματα κλειδιού εταιρίας
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Πατήστε εδώ για εναλλαγή εμφάνισης της εταιρίας στο γράφημα
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Εναλλαγή εμφάνισης γραφήματος της εταιρίας
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Πίνακας Πρωταθλήματος Εταιριών
@@ -803,7 +803,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Επιλ
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Επιλογή προγράμματος «στυλ μουσικής Ezy Street»
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Επιλογή προγράμματος «Προσαρμοσμένο 1»
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Επιλογή προγράμματος «Προσαρμοσμένο 2»
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Εναλλαγή τυχαίας αναπαραγωγής on/off στο πρόγραμμα
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Εναλλαγή τυχαίας αναπαραγωγής προγράμματος
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Εμφάνιση παραθύρου επιλογής μουσικού κομματιού
# Playlist window
@@ -886,7 +886,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Έρημος
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Χιόνι
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Εναλλαγή ονομάτων πόλεων στον χάρτη
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Εναλλαγή εμφάνισης των ονομάτων πόλεων
STR_SMALLMAP_CENTER :{BLACK}Κεντράρισμα του μικρού χάρτη στην τρέχουσα θέση
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -895,9 +895,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Απενεργοποίηση όλων
STR_SMALLMAP_ENABLE_ALL :{BLACK}Ενεργοποίηση όλων
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Εμφάνιση ύψους
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Εμφάνιση ονομάτων βιομηχανιών
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Εμφάνιση καμίας βιομηχανίας στον χάρτη
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Εμφάνιση όλων των βιομηχανιών στον χάρτη
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Εναλλάγη εμφάνισης υψομετρικού χάρτη
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Εναλλαγή εμφάνισης των ονομάτων βιομηχανιών
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Απόκρυψη όλων των ιδιοκτησιών των εταιριών στον χάρτη
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Εμφάνιση όλων των ιδιοκτησιών των εταιριών στον χάρτη
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Απόκρυψη όλων των φορτίων στο χάρτη
@@ -2977,6 +2979,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Κατα
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Κατασκευή τροχιοδρόμου χρησιμοποιώντας τη λειτουργία Αυτόματου Τροχιοδρόμου. Ctrl+Κλικ για αφαίρεση τροχιόδρομου. Επίσης, πατήστε το Shift για εμφάνιση εκτιμώμενου κόστους μόνο
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Κατασκευή αμαξοστασίου οδικών οχημάτων (για αγορά και επισκευή οχημάτων). Επίσης, πατήστε το Shift για εμφάνιση εκτιμώμενου κόστους μόνο
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Κατασκευή αμαξοστασίου οχημάτων τροχιοδρόμου (για αγορά και συντήρηση οχημάτων). Επίσης, πατήστε το Shift για εμφάνιση εκτιμώμενου κόστους μόνο
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Κατασκευή σημείου αναφοράς στο δρόμο. Ctrl+Click για επιλογή πρόσθετου σημείου αναφοράς για συμμετοχή. Επίσης, πατήστε το Shift για εμφάνιση εκτιμώμενου κόστους μόνο
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Κατασκευή σημείου αναφοράς στην τροχιά τραμ. Ctrl+Click για επιλογή πρόσθετου σημείου αναφοράς για συμμετοχή. Επίσης, πατήστε το Shift για εμφάνιση εκτιμώμενου κόστους μόνο
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Κατασκευή σταθμού λεωφορείων. Ctrl+Κλικ για επιλογή πρόσθετου σταθμού για συνένωση. Επίσης, πατήστε το Shift για εμφάνιση εκτιμώμενου κόστους μόνο
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Κατασκευή επιβατικού σταθμού τροχιοδρόμου. Ctrl+Κλικ για επιλογή πρόσθετου επιβατικού σταθμού για συνένωση. Επίσης, πατήστε το Shift για εμφάνιση εκτιμώμενου κόστους μόνο
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Κατασκευή σταθμού φορτηγών. Ctrl+Κλικ για επιλογή πρόσθετου σταθμού για συνένωση. Επίσης, πατήστε το Shift για εμφάνιση εκτιμώμενου κόστους μόνο
@@ -3709,7 +3713,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Μετά
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Δώστε ένα όνομα για την πινακίδα
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Πόλεις
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Πόλεις ({COMMA} από {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Τίποτα -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Πόλη){BLACK} ({COMMA})
@@ -4044,7 +4048,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/περίοδο
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Βιομηχανίες
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Βιομηχανίες ({COMMA} από {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Τίποτα -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% μεταφέρθηκαν){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5193,11 +5197,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Συνε
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Πολύ κοντά σε άλλο σημείο καθοδήγησης
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Δεν μπορεί να κατασκευαστεί σημείο καθοδήγησης τρένου εδώ...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Δεν μπορεί να κατασκευαστεί οδικό σημείο καθοδήγησης εδώ...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Δεν μπορεί να τοποθετηθεί σημαδούρα εδώ...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Δεν μπορεί να αλλάξει το όνομα του σημείου καθοδήγησης...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Αδύνατο να αφαιρεθεί το σημείο καθοδήγησης τρένου από εδώ...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Αδύνατο να αφαιρεθεί το οδικό σημείο καθοδήγησης από εδώ...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Πρέπει να αφαιρεθεί το σημείο καθοδήγησης σιδηρόδρομου πρώτα
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Πρέπει να αφαιρεθεί το οδικό σημείο καθοδήγησης πρώτα
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... σημαδούρα στη μέση
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... σημαδούρα σε χρήση από άλλη εταιρία!
@@ -5445,6 +5452,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Δεν
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Το αεροπλάνο αυτό δεν μπορεί να προσγειωθεί σε αυτό το ελικοδρόμιο
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Το ελικόπτερο αυτό δεν μπορεί να προσγειωθεί σε αυτό το αεροδρόμιο
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Δεν υπάρχει σημείο καθοδήγησης σιδηροδρόμου
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Δεν υπάρχει οδικό σημείο καθοδήγησης
STR_ERROR_NO_BUOY :{WHITE}Δεν υπάρχει σημαδούρα
# Timetable related errors
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index 6d6e792073..c2117d5587 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -3154,7 +3154,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}עבור
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}הכנס שם סימניה
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}ערים
STR_TOWN_DIRECTORY_NONE :{ORANGE}- אין -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (City){BLACK} ({COMMA})
@@ -3441,7 +3440,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}משבצ
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}נמלי תעופה
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}תעשיות
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- אין -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_ITEM_PROD1 :{ORANGE}{INDUSTRY} {STRING}
diff --git a/src/lang/hindi.txt b/src/lang/hindi.txt
index 0bb2afed32..89ba4d0b03 100644
--- a/src/lang/hindi.txt
+++ b/src/lang/hindi.txt
@@ -1151,7 +1151,6 @@ STR_COMPANY_VIEW_COMPANY_NAME_BUTTON :{BLACK}कं
# Company infrastructure window
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}उद्योग
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_ITEM_PROD1 :{ORANGE}{INDUSTRY} {STRING}
STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 5ff9ba4da2..31d5842b18 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -3638,7 +3638,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Előző
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Felirat szövegének szerkesztése
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Városok
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Nincs -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Város){BLACK} ({COMMA})
@@ -3972,7 +3971,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/időszak
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Gazdasági épületek
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nincs -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% elszállítva){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 04728dbdfb..62a52ef01d 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -2851,7 +2851,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Fara að
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Sláðu inn nafn fyrir skiltið
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Bæir
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Enginn -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Bæjanöfn - smelltu á nafn til að færa sjónarhorn að viðkomandi bæ. Ctrl+smelltu til að opna nýtt sjónarhorn yfir þessum bæ
@@ -3093,7 +3092,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Stöðva
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Flugvellir
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Iðnaðir
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Enginn -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Iðnaðar nöfn - smella á nafn til að færa miðju sjónarhorns á iðnað. Ctrl+smella til að opna nýtt sjónarhorn yfir þessum iðnaði
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 777c7775b4..fc396c12f0 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -3509,7 +3509,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Pergi ke
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Masukkan nama rambu
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Kota
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Tidak Ada -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Kota){BLACK} ({COMMA})
@@ -3827,7 +3826,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periode
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industri
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Tidak Ada -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% Terkirim){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/irish.txt b/src/lang/irish.txt
index 91607ee957..76f36ec122 100644
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -3297,7 +3297,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Gabh chu
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Iontráil ainm don chomhartha
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Bailte
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ceann ar bith -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Cathair){BLACK} ({COMMA})
@@ -3588,7 +3587,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Tíleann
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Aerfoirt
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Tionscail
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ceann ar bith -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} (Iompraíodh {COMMA}%){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 3a762a76c4..ae41d280bf 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -3612,7 +3612,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Va al ca
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Inserire il testo del cartello
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Città
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Nessuna -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Metropoli){BLACK} ({COMMA})
@@ -3946,7 +3945,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periodo
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrie
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nessuna -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% trasportato){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 5a4445507b..4b17ed9913 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -3380,7 +3380,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}前の
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}標識の内容を入力
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}街一覧
STR_TOWN_DIRECTORY_NONE :{ORANGE}- なし-
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (都市){BLACK} ({COMMA})
@@ -3685,7 +3684,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}停留
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}空港
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}産業
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- なし -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% 輸送済み){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 4fd2b6fc62..45a0502109 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -624,14 +624,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}모두 사용 안 함
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}화물 운송단가 비율 그래프에서 모든 화물을 표시
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}화물 운송단가 비율 그래프에서 모든 화물을 표시 안 함
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}이 화물에 대한 그래프 켜기/끄기
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}이 화물의 그래프를 표시하거나 숨깁니다
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}상세 성취도를 봅니다.
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}회사 그래프 범례
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}특정 회사의 그래프를 보이거나 숨기려면 여기를 클릭하세요.
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}특정 회사의 그래프를 표시하거나 숨기려면 여기를 클릭하세요.
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}회사 성취도 순위
@@ -711,7 +711,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}'뉴 스
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}'이지 스트릿 스타일 음악' 프로그램을 선택합니다.
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}'사용자 1' (유저 정의) 음악 프로그램을 선택합니다.
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}'사용자 2' (유저 정의) 음악 프로그램을 선택합니다.
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}프로그램을 무작위 재생합니다.
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}프로그램을 무작위 재생합니다
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}배경 음악 트랙을 선택할 수 있는 창을 엽니다.
# Playlist window
@@ -794,7 +794,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}사막
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}눈
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}도시 이름을 보이거나 숨깁니다.
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}도시 이름을 표시하거나 숨깁니다
STR_SMALLMAP_CENTER :{BLACK}소형지도 내부창의 위치를 현재 게임 화면 위치로 이동시킵니다.
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -803,9 +803,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}모두 사용 안 함
STR_SMALLMAP_ENABLE_ALL :{BLACK}모두 사용
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}고도 표시
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}산업시설 이름 표시
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}지도 상의 모든 산업시설을 숨깁니다.
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}지도 상의 모든 산업시설을 보여줍니다.
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}지형의 높낮이를 표시합니다.
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}산업시설의 이름을 표시하거나 숨깁니다
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}그 어떤 회사의 재산도 지도에 표시하지 않습니다.
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}모든 회사의 재산을 지도에 표시합니다.
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}화물 흐름을 게임 화면에 표시하지 않습니다.
@@ -2885,6 +2887,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}자동
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}자동건설 모드로 전차 선로를 짓습니다. CTRL+클릭하면 전찻길 일부분을 제거할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}차고지를 건설합니다. 차량을 구입하거나 점검을 할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}전차 차고지를 건설합니다. 차량을 구입하거나 점검을 할 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}도로에 경유지를 설치합니다. CTRL+클릭하면 같은 이름의 경유지를 서로 떨어진 곳에 지을 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}전차 선로에 경유지를 설치합니다. CTRL+클릭하면 같은 이름의 경유지를 서로 떨어진 곳에 지을 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}버스 정류장을 짓습니다. CTRL+클릭하면 같은 이름의 정류장을 서로 떨어진 곳에 지을 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}여객 전차역을 짓습니다. CTRL+클릭하면 같은 이름의 전차역을 서로 떨어진 곳에 지을 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}트럭 적하장을 짓습니다. CTRL+클릭하면 같은 이름의 적하장을 서로 떨어진 곳에 지을 수 있습니다. SHIFT 키를 누른 채로 사용하면 예상 비용을 볼 수 있습니다
@@ -3617,7 +3621,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}이전
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}팻말 이름을 입력하세요
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}도시 목록
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}도시 목록 ({1:COMMA}개 중 {0:COMMA}개)
STR_TOWN_DIRECTORY_NONE :{ORANGE}(없음)
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (대도시){BLACK} ({COMMA})
@@ -3951,7 +3955,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/기간
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}산업시설
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}산업시설 ({1:COMMA}개 중 {0:COMMA}개)
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}(없음)
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% 수송됨){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5072,32 +5076,35 @@ STR_ERROR_DRIVE_THROUGH_JUNCTION :{WHITE}... 통
# Station destruction related errors
STR_ERROR_CAN_T_REMOVE_PART_OF_STATION :{WHITE}역의 일부를 제거할 수 없습니다...
-STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST :{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}여객 전차역을 제거할 수 없습니다...
STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION :{WHITE}화물 전차역을 제거할 수 없습니다...
-STR_ERROR_MUST_REMOVE_ROAD_STOP_FIRST :{WHITE}정류장을 먼저 제거하십시오
+STR_ERROR_MUST_REMOVE_ROAD_STOP_FIRST :{WHITE}정류장을 먼저 제거하세요
STR_ERROR_THERE_IS_NO_STATION :{WHITE}... 여기에는 정거장이 없습니다
-STR_ERROR_MUST_DEMOLISH_RAILROAD :{WHITE}철도역을 먼저 제거하십시오
-STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST :{WHITE}버스 정류장을 먼저 제거하십시오
-STR_ERROR_MUST_DEMOLISH_TRUCK_STATION_FIRST :{WHITE}트럭 적하장을 먼저 제거하십시오
-STR_ERROR_MUST_DEMOLISH_PASSENGER_TRAM_STATION_FIRST :{WHITE}여객 전차역을 먼저 제거하십시오
-STR_ERROR_MUST_DEMOLISH_CARGO_TRAM_STATION_FIRST :{WHITE}화물 전차역을 먼저 제거하십시오
-STR_ERROR_MUST_DEMOLISH_DOCK_FIRST :{WHITE}항구를 먼저 제거하십시오
-STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST :{WHITE}공항을 먼저 제거하십시오
+STR_ERROR_MUST_DEMOLISH_RAILROAD :{WHITE}철도역을 먼저 제거하세요
+STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST :{WHITE}버스 정류장을 먼저 제거하세요
+STR_ERROR_MUST_DEMOLISH_TRUCK_STATION_FIRST :{WHITE}트럭 적하장을 먼저 제거하세요
+STR_ERROR_MUST_DEMOLISH_PASSENGER_TRAM_STATION_FIRST :{WHITE}여객 전차역을 먼저 제거하세요
+STR_ERROR_MUST_DEMOLISH_CARGO_TRAM_STATION_FIRST :{WHITE}화물 전차역을 먼저 제거하세요
+STR_ERROR_MUST_DEMOLISH_DOCK_FIRST :{WHITE}항구를 먼저 제거하세요
+STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST :{WHITE}공항을 먼저 제거하세요
# Waypoint related errors
STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}최소한 하나 이상의 경유지와 연결하십시오
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}다른 경유지와 너무 가깝습니다!
-STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}여기에 열차 경유지를 설치할 수 없습니다...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}여기에 열차 경유지를 지을 수 없습니다...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}여기에 도로 경유지를 지을 수 없습니다...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}여기에 부표를 설치할 수 없습니다...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}경유지의 이름을 변경할 수 없습니다...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}이 열차 경유지를 제거할 수 없습니다...
-STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}열차 경유지를 먼저 제거하십시오
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}이 도로 경유지를 제거할 수 없습니다...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}열차 경유지를 먼저 제거하세요
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}도로 경유지를 먼저 제거하세요
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... 도중에 부표가 있습니다
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... 다른 회사에서 사용 중인 부표입니다!
@@ -5143,9 +5150,9 @@ STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}새로
# Rail construction errors
STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}불가능한 트랙 조합입니다
-STR_ERROR_MUST_REMOVE_SIGNALS_FIRST :{WHITE}신호기를 먼저 제거하십시오
+STR_ERROR_MUST_REMOVE_SIGNALS_FIRST :{WHITE}신호기를 먼저 제거하세요
STR_ERROR_NO_SUITABLE_RAILROAD_TRACK :{WHITE}적합한 철도 선로가 없습니다
-STR_ERROR_MUST_REMOVE_RAILROAD_TRACK :{WHITE}선로를 먼저 제거하십시오
+STR_ERROR_MUST_REMOVE_RAILROAD_TRACK :{WHITE}선로를 먼저 제거하세요
STR_ERROR_CROSSING_ON_ONEWAY_ROAD :{WHITE}도로가 일방통행이거나 막혔습니다
STR_ERROR_CROSSING_DISALLOWED_RAIL :{WHITE}이 선로에는 건널목을 만들 수 없습니다
STR_ERROR_CROSSING_DISALLOWED_ROAD :{WHITE}이 도로에는 건널목을 만들 수 없습니다
@@ -5160,7 +5167,7 @@ STR_ERROR_THERE_ARE_NO_SIGNALS :{WHITE}... 신
STR_ERROR_CAN_T_CONVERT_RAIL :{WHITE}이곳의 선로를 바꿀 수 없습니다...
# Road construction errors
-STR_ERROR_MUST_REMOVE_ROAD_FIRST :{WHITE}도로를 먼저 제거하십시오
+STR_ERROR_MUST_REMOVE_ROAD_FIRST :{WHITE}도로를 먼저 제거하세요
STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... 일방통행로에는 교차로를 만들 수 없습니다.
STR_ERROR_CAN_T_BUILD_ROAD_HERE :{WHITE}도로를 건설할 수 없습니다...
STR_ERROR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}여기에 전찻길을 건설할 수 없습니다...
@@ -5182,7 +5189,7 @@ STR_ERROR_CAN_T_BUILD_ON_WATER :{WHITE}... 물
STR_ERROR_CAN_T_BUILD_ON_SEA :{WHITE}... 바다 위에 지을 수 없습니다
STR_ERROR_CAN_T_BUILD_ON_CANAL :{WHITE}... 운하 위에 지을 수 없습니다
STR_ERROR_CAN_T_BUILD_ON_RIVER :{WHITE}... 강 위에 지을 수 없습니다
-STR_ERROR_MUST_DEMOLISH_CANAL_FIRST :{WHITE}운하를 먼저 제거하십시오
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST :{WHITE}운하를 먼저 제거하세요
STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE :{WHITE}여기에 수도교를 지을 수 없습니다...
# Tree related errors
@@ -5192,7 +5199,7 @@ 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_MUST_DEMOLISH_BRIDGE_FIRST :{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}이 지형에 다리를 설치하기에는 고도가 너무 낮습니다.
@@ -5205,7 +5212,7 @@ STR_ERROR_BRIDGE_THROUGH_MAP_BORDER :{WHITE}다리
# Tunnel related errors
STR_ERROR_CAN_T_BUILD_TUNNEL_HERE :{WHITE}여기에 터널을 지을 수 없습니다...
STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}터널 입구를 짓기에 적절하지 않은 장소입니다
-STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}터널을 먼저 제거하십시오
+STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}터널을 먼저 제거하세요
STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY :{WHITE}중간에 다른 터널이 있습니다
STR_ERROR_TUNNEL_THROUGH_MAP_BORDER :{WHITE}터널을 지도 맨 끝까지 건설할 수 없습니다
STR_ERROR_UNABLE_TO_EXCAVATE_LAND :{WHITE}지형 문제로 터널의 반대쪽 출구를 만들 수 없습니다
@@ -5345,6 +5352,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}굴절
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}이 항공기는 이 공항에 착륙할 수 없습니다
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}이 헬리콥터는 이 공항에 착륙할 수 없습니다
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}철도 경유지가 없습니다
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}도로 경유지가 없습니다
STR_ERROR_NO_BUOY :{WHITE}부표가 없습니다
# Timetable related errors
diff --git a/src/lang/latin.txt b/src/lang/latin.txt
index 46d68459e7..6da8cffdab 100644
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -3249,7 +3249,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Recedere
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Inscribe nomen signi
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Oppida
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Nulla -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Urbs){BLACK} ({COMMA})
@@ -3530,7 +3529,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Tegulae
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Aeroportus
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industriae
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nullae -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Nomina industriarum - preme in nomen ut conspectus moveatur supra industriam. Ctrl+Preme ut nova fenestra conspectus aperiatur supra industriam
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 3f953a50f0..35c8cf1c14 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -625,14 +625,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Atspējot visu
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Rādīt visas kravas samaksu salīdzināšanas diagrammā
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Nerādīt nevienu kravu samaksu salīdzināšanas diagrammā
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Ieslēgt/izslēgt kravu veidu diagrammu
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Paslēgt kravas veida diagrammu
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Rādīt detalizētus uzņēmējdarbības vērtējumus
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Apzīmējumu atslēgas uzņēmumu diagrammās
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klikšķināt šeit, lai ieslēgtu/izslēgtu uzņēmuma attēlošanu diagrammā
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Pāslēgt uzņēmuma attēlošanu diagrammu
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Uzņēmumu rangu saraksts
@@ -712,7 +712,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Izvēlē
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Izvēlēties programmu 'Ezy Ielas stila mūzika'
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Izvēlēties programmu 'Pielāgotā 1' (lietotāja sastādīto)
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Izvēlēties programmu 'Pielāgotā 2' (lietotāja sastādīto)
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Ieslēgt/izslēgt mūzikas saraksta jaukšanu
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Pārslēgt mūzikas saraksta jaukšanu
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Rādīt mūzikas celiņu atlases logu
# Playlist window
@@ -795,7 +795,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Tuksnesis
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Sniegs
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Rādīt/nerādīt pilsētu nosaukumus uz kartes
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Rādīt pilsētu nosaukumus uz kartes
STR_SMALLMAP_CENTER :{BLACK}Centrēt minikarti uz pašreizējo pozīciju
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -1490,6 +1490,8 @@ STR_CONFIG_SETTING_WARN_INCOME_LESS :Brīdināt, ja
STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT :Ja ieslēgts, tiks sūtīts ziņojums gadījumā kad transportlīdzeklis negūst nekādu peļņu kalendārā gada laikā
STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT_PERIOD :Ja ieslēgts, tik nosūtīts ziņojums, ja transportlīdzeklis noteiktā periodā nav guvis peļņu
+STR_CONFIG_SETTING_WARN_OLD_VEHICLE :Brīdināt, kad transportlīdzeklis noveco: {STRING}
+STR_CONFIG_SETTING_WARN_OLD_VEHICLE_HELPTEXT :Kad iespējots, tiek nosūtīta ziņa, kad transportlīdzeklis noveco
STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :Transportlīdzekļi nekad "nemirst": {STRING}
STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES_HELPTEXT :Kad ieslēgts, visi transportlīdzekļu modeļi pēc to ieviešanas vienmēr ir pieejami
@@ -2774,7 +2776,7 @@ STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION :Magleva būvē
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Būvēt sliedes. Ctrl pārslēdz sliežu būvniecību/nojaukšanu. Shift parāda novērtētās izmaksas, neveicot būvēšanu
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL :{BLACK}Būvēt dzelzceļu, izmantojot automātisko sliežu režīmu. Ctrl+klikšķis pārslēdz sliežu būvniecību/demolēšanu. Shift parāda novērtētās izmaksas, neveicot būvēšanu
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Būvēt vilcienu depo (vilcienu pirkšanai un apkopei). Shift parāda novērtētās izmaksas, neveicot būvēšanu
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Izveidojiet ceļa punktu uz dzelzceļa. Ctrl ļauj pievienot vairākus pieturas punktus. Shift parāda novērtētās izmaksas, neveicot būvēšanu
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Izveidot ceļa punktu uz dzelzceļa. Ctrl ļauj pievienot vairākus pieturas punktus. Shift parāda novērtētās izmaksas, neveicot būvēšanu
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION :{BLACK}Būvēt dzelzceļa staciju. Ctrl+klikšķis iespējo staciju apvienošanu. Shift parāda izmaksas, neveicot būvēšanu
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Būvējiet signālu uz dzelzceļa. Ctrl+klikšķis, lai izveidotu alternatīvu signāla stilu{}Velciet, lai atlasīto sliedes posmu aizpildītu ar signāliem izvēlētajā atstatumā. Velciet Ctrl+klikšķis, lai aizpildītu signālus līdz nākamajam krustojumam, stacijai vai signālam. Shift parāda izmaksas, neveicot būvēšanu
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Būvēt dzelzceļa tiltu. Shift pārslēdz būvēšanu/izmaksu tāmes rādīšanu
@@ -2886,6 +2888,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Būvēt
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Būvēt tramvaju sliedes izmantojot automātisko paņēmienu. Ctrl+klikšķis pārslēdz tramvaju sliežu būvēšanu/nojaukšanu. Shift parāda novērtētās izmaksas, neveicot būvēšanu
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Būvēt autotransporta depo (autotransporta līdzekļu pirkšanai un apkopei). Shift pārslēdz būvēšanu/izmaksu tāmes rādīšanu
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Būvēt tramvaju depo (tramvaju pirkšanai un apkopei). Shift parāda izmaksas, neveicot būvēšanu
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Izveidot pieturas punktu uz ceļa. Ctrl+klikšķis, lai atlasītu citu ceļa punktu, kuram pievienoties. Shift parāda novērtētās izmaksas, neveicot būvēšanu
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Izveidot pieturas punktu uz tramvaja ceļa. Ctrl+klikšķis, lai atlasītu citu ceļa punktu, kuram pievienoties. Shift parāda novērtētās izmaksas, neveicot būvēšanu
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Būvēt autobusu pieturvietu. Ctrl+klikšķis ieslēdz pieturvietu apvienošanu. Shift+klikšķis parāda izmaksas, neveicot būvēšanu
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Būvēt pasažieru tramvaju staciju. Ctrl+klikšķis, lai atlasītu citu staciju, kurai pievienoties. Nospiediet taustiņu Shift, lai rādītu izmaksu tāmi
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Būvēt kravas automašīnu staciju. Ctrl+klikšķis iespējo staciju apvienošanu. Shift parāda izmaksas, neveicot būvēšanu
@@ -3621,7 +3625,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Doties u
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Ievadīt zīmes nosaukumu
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Pilsētas
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Pilsētas ({COMMA} no {COMMA})
STR_TOWN_DIRECTORY_NONE :{G=m}{ORANGE}- Neviens -
STR_TOWN_DIRECTORY_NONE.kas :{ORANGE}- Neviena -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -3958,7 +3962,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periods
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Ražotnes
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Ražotnes ({COMMA} no {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{G=m}{ORANGE}- Neviens -
STR_INDUSTRY_DIRECTORY_NONE.kas :{ORANGE}- Neviena -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} (pārvadāti {COMMA}%){BLACK}
@@ -5101,11 +5105,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Blakus a
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Pārāk tuvu citam pieturas punktam
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Šeit nevar uzbūvēt vilcienu pieturas punktu...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Šeit nevar izveidot ceļa pieturas punktu...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Šeit nevar novietot boju...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Nevar pārdēvēt pieturas punktu...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Seit nevar noņemt vilcienu pieturas punktu...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Šeit nevar noņemt ceļa pieturas punktu...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Vispirms ir jānoņem dzelzceļa pieturas punktu
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Vispirms ir jānoņem ceļa pieturas punkts
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... ceļā boja
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... boju jau izmanto cits uzņēmums!
@@ -5353,6 +5360,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Nav piet
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Šī lidmašīna nevar nolaisties šajā helikopteru lidlaukā
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Šis helikopters nevar nolaisties šajā lidostā
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Nav dzelzceļa pieturas punkta
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Nav ceļa pieturas punkta
STR_ERROR_NO_BUOY :{WHITE}Bojas nav
# Timetable related errors
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index d3e54e6db4..9629123ef5 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -3734,7 +3734,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Eiti pri
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Įrašykite ženklo pavadinimą
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Miestai
STR_TOWN_DIRECTORY_NONE :{ORANGE}Nėra
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Miestas){BLACK} ({COMMA})
@@ -4057,7 +4056,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG} per metus
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Gamyklos
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nieko -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportuota){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index bc1b26d6cb..5c0162e2ca 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -3574,7 +3574,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Géi bei
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Gëff en Numm fir d'Schëld an
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Stied
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Keng -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Stad){BLACK} ({COMMA})
@@ -3908,7 +3907,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/Period
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrien
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Keng -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportéiert){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/malay.txt b/src/lang/malay.txt
index 076e1a578c..adfa5350b4 100644
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -2755,7 +2755,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Pergi ke
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Masukkan nama untuk papan tanda
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Bandar-bandar
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Tiada -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Senarai bandar - klik nama bandar untuk memusatkan pemandangan ke bandar. Ctrl+Klik untuk membuka tetingkap pemandangan di lokasi bandar
@@ -2998,7 +2997,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Petak st
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Lapangan Terbang
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industri
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Tiada -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Nama industri - klik pada nama untuk memusatkan pemandangan ke industri. Ctrl+Klik membuka tetingkap pemandangan di lokasi industri
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index ec9fbc8fb0..3c75c47c19 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -795,7 +795,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Ørken
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Snø
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Skru av/på bynavn på kartet
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Skru av/på bynavn
STR_SMALLMAP_CENTER :{BLACK}Midstill oversiktskartet på gjeldende posisjon
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -807,6 +807,7 @@ STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Vis høy
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Ikke vis industrier på kartet
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Vis alle industrier på kartet
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Veksle mellom visning av høydekart
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Skru av/på industrinavn
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Ikke vis selskapseiendommer på kartet
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Vis alle selskapseiendommer på kartet
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Ikke vis noen varetyper på kartet
@@ -3618,7 +3619,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Gå til
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Skriv inn et navn på skiltet
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Byer
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Byer ({COMMA} av {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ingen -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (By){BLACK} ({COMMA})
@@ -3952,7 +3953,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periode
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrier
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrier ({COMMA} av {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ingen -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportert){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5098,7 +5099,9 @@ STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Kan ikke
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Kan ikke endre navn på veipunkt...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Kan ikke fjerne veipunkt for tog her...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Kan ikke fjerne veipunkt for vei her...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Må fjerne veipunkt for tog først
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Må fjerne veipunkt for vei først
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... bøyen er i veien
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... bøyen er i bruk av et annet selskap!
@@ -5346,6 +5349,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Det er i
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Dette flyet kan ikke lande på denne helikopterplassen
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Dette helikopteret kan ikke lande på denne flyplassen
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Det finnes ingen jernbaneveipunkt
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Det finnes ingen veipunkt for vei
STR_ERROR_NO_BUOY :{WHITE}Det finnes ingen bøye
# Timetable related errors
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 96f85f212b..afbde4eb18 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -2929,7 +2929,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Gå til
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Skriv inn eit namn for skiltet
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Byar
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ingen -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Bynamn - Klikk på bynamnet for å sjå byen i hovedvisninga. Ctrl+klikk syner byen i eit nytt tilleggsvindauge.
@@ -3206,7 +3205,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Stasjons
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Flyplassar
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industriar
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ingen -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Industrinamn - Klikk på namnet for å syne industrien i hovedvisninga. CTRL+klikk syner industrien i eit tilleggsvindauge
diff --git a/src/lang/persian.txt b/src/lang/persian.txt
index 2cf5573d2b..ccd185581d 100644
--- a/src/lang/persian.txt
+++ b/src/lang/persian.txt
@@ -2755,7 +2755,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}برو
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}برای نشانه یک نام وارد کنید
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}شهرها
STR_TOWN_DIRECTORY_NONE :{ORANGE}- هیچکدام -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}نام شهرها - کلیک روی نام شهر آن را در وسط صفحه نمایش می دهد. کنترل + کلیک یک نمای اضافه از مکان شهر باز می کند
@@ -2978,7 +2977,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}قطعه
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}فرودگاه ها
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :کارخانه ها
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- هیچ -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_ITEM_PROD2 :{ORANGE}{INDUSTRY} {STRING}, {STRING}
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index d070b96270..91f7f035f5 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -1009,7 +1009,7 @@ STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Pokaż s
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Legenda do wykresów firm
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Kliknij tutaj, aby przełączyć wyświetlanie wykresu firmy
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Przełącz wyświetlanie wykresu danej firmy
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Ranking firm
@@ -1089,7 +1089,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Wybierz
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Wybierz program „Ezy Street”
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Wybierz program „Własny 1” (zdefiniowany przez użytkownika)
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Wybierz program „Własny 2” (zdefiniowany przez użytkownika)
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Włącz/wyłącz losowe odtwarzanie
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Przełącz losowe odtwarzanie
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Pokaż okno wyboru ścieżek
# Playlist window
@@ -1173,7 +1173,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Pustynia
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Śnieg
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Pokaż nazwy miast na mapie
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Przełącz wyświetlanie nazw miast
STR_SMALLMAP_CENTER :{BLACK}Wyśrodkuj mapę na aktualnej lokalizacji
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -1182,9 +1182,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Wyłącz wszystko
STR_SMALLMAP_ENABLE_ALL :{BLACK}Włącz wszystko
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Pokaż wysokość
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Nazwy przedsiębiorstw
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Nie pokazuj przedsiębiorstw na mapie
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Pokaż wszystkie przedsiębiorstwa na mapie
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Przełącz wyświetlanie mapy wysokości
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Przełącz wyświetlanie nazw przedsiębiorstw
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Nie wyświetlaj własności firm na mapie
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Wyświetl własności wszystkich firm na mapie
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Nie wyświetlaj ładunków na mapie
@@ -3264,6 +3266,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Zbuduj d
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Zbuduj tory tramwajowe używając trybu Autotory. Użyj Ctrl, aby usunąć fragment torów. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Zbuduj zajezdnię samochodową (do kupowania i serwisowania pojazdów). Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Zbuduj zajezdnię tramwajową (do kupowania i serwisowania pojazdów). Użyj Shift, aby tylko wyświetlić szacunkowy koszt
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Zbuduj posterunek na drodze. Użyj Ctrl, aby połączyć z innym posterunkiem. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Zbuduj posterunek na linii tramwajowej. Użyj Ctrl, aby połączyć z innym posterunkiem. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Zbuduj przystanek autobusowy. Użyj Ctrl, aby połączyć z inną stacją. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Zbuduj pasażerski przystanek tramwajowy. Użyj Ctrl, aby połączyć z inną stacją. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Zbuduj stację ciężarówek. Użyj Ctrl, aby połączyć z inną stacją. Użyj Shift, aby tylko wyświetlić szacunkowy koszt
@@ -3984,8 +3988,8 @@ STR_NEWGRF_SCAN_ARCHIVES :Skanowanie w po
# Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Lista napisów - {COMMA} napis{P "" y ów}
-STR_SIGN_LIST_MATCH_CASE :{BLACK}Wielkość znaków
-STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Przełącza uwzględnianie wielkości znaków przy porównywaniu tekstu napisu z filtrem
+STR_SIGN_LIST_MATCH_CASE :{BLACK}Wielkość liter
+STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Przełącz uwzględnianie wielkości liter przy porównywaniu tekstu napisu z filtrem
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Edycja tekstu napisu
@@ -3996,7 +4000,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Idź do
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Wpisz nazwę dla znaku
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Miasta
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Miasta ({COMMA} z {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Żaden -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Metropolia){BLACK} ({COMMA})
@@ -4330,7 +4334,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/okres
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Przedsiębiorstwa
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Przedsiębiorstwa ({COMMA} z {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Żaden -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% przetransportowano){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -4549,7 +4553,7 @@ STR_BUY_VEHICLE_AIRCRAFT_SHOW_TOGGLE_BUTTON :{BLACK}Wyświet
STR_BUY_VEHICLE_TRAIN_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Przełącz ukrywanie/wyświetlanie danego typu taboru
STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Przełącz ukrywanie/wyświetlanie danego typu pojazdu
STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Przełącz ukrywanie/wyświetlanie danego typu statku
-STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Przełącz ukrywanie/wyświetlanie danego typu ssamolotu
+STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Przełącz ukrywanie/wyświetlanie danego typu samolotu
###length VEHICLE_TYPES
STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Zmiana nazwy typu pociągu
@@ -5350,7 +5354,7 @@ STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Teren po
STR_ERROR_CAN_T_DO_THIS :{WHITE}Nie można tego zrobić...
STR_ERROR_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Należy najpierw zburzyć budynek
STR_ERROR_CAN_T_CLEAR_THIS_AREA :{WHITE}Nie można wyczyścić terenu...
-STR_ERROR_SITE_UNSUITABLE :{WHITE}... niewłaściwa parcela
+STR_ERROR_SITE_UNSUITABLE :{WHITE}... nieodpowiednie miejsce
STR_ERROR_ALREADY_BUILT :{WHITE}... już zbudowano
STR_ERROR_OWNED_BY :{WHITE}... własność {STRING.d}
STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... teren jest własnością innej firmy
@@ -5408,17 +5412,17 @@ STR_ERROR_CAN_T_BUILD_HOUSE :{WHITE}Nie moż
# Industry related errors
STR_ERROR_TOO_MANY_INDUSTRIES :{WHITE}... zbyt wiele przedsiębiorstw
STR_ERROR_CAN_T_GENERATE_INDUSTRIES :{WHITE}Nie można stworzyć przedsiębiorstw...
-STR_ERROR_CAN_T_BUILD_HERE :{WHITE}Nie można tutaj wybudować: {STRING}...
-STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY :{WHITE}Nie można tutaj wybudować tego przedsiębiorstwa...
+STR_ERROR_CAN_T_BUILD_HERE :{WHITE}Nie można tutaj zbudować: {STRING}...
+STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY :{WHITE}Nie można tutaj zbudować przedsiębiorstwa tego typu...
STR_ERROR_CAN_T_PROSPECT_INDUSTRY :{WHITE}Nie można znaleźć przedsiębiorstwa...
STR_ERROR_INDUSTRY_TOO_CLOSE :{WHITE}... zbyt blisko innego przedsiębiorstwa
STR_ERROR_MUST_FOUND_TOWN_FIRST :{WHITE}... należy najpierw wybudować miasto
STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN :{WHITE}... dozwolone jedno na miasto
STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200 :{WHITE}... można zbudować jedynie w miastach o populacji przynajmniej 1200
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}... może być wybudowane tylko w lasach deszczowych
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}... może być wybudowane tylko na pustyni
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}... można wybudować tylko w mieście (zastępując domy)
-STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER :{WHITE}... można wybudować tylko w pobliżu centrum miast
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}... można zbudować tylko na obszarach lasów deszczowych
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}... można zbudować tylko na obszarach pustynnych
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}... można zbudować tylko w mieście (zastępując domy)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER :{WHITE}... można zbudować tylko w pobliżu centrum miasta
STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS :{WHITE}... może być budowane tylko na niskich terenach
STR_ERROR_CAN_ONLY_BE_POSITIONED :{WHITE}... może być usytuowane tylko blisko krawędzi mapy
STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}... las może być posadzony tylko powyżej linii śniegu
@@ -5431,13 +5435,13 @@ STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES :{WHITE}Nie ma o
STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Zmień parametry tworzenia map, żeby uzyskać lepsze mapy
# Station construction related errors
-STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Nie można tutaj wybudować stacji...
+STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Nie można tutaj zbudować stacji...
STR_ERROR_CAN_T_BUILD_BUS_STATION :{WHITE}Nie można zbudować przystanku...
STR_ERROR_CAN_T_BUILD_TRUCK_STATION :{WHITE}Nie można zbudować stacji ciężarówek...
STR_ERROR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nie można zbudować przystanku tramwajowego...
STR_ERROR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nie można zbudować tramwajowej stacji załadunkowej...
-STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Nie można tutaj wybudować portu...
-STR_ERROR_CAN_T_BUILD_AIRPORT_HERE :{WHITE}Nie można tutaj wybudować lotniska...
+STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Nie można tutaj zbudować portu...
+STR_ERROR_CAN_T_BUILD_AIRPORT_HERE :{WHITE}Nie można tutaj zbudować lotniska...
STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Przylega do więcej niż jednej stacji
STR_ERROR_STATION_TOO_SPREAD_OUT :{WHITE}... stacja zbyt rozległa
@@ -5477,20 +5481,23 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST :{WHITE}Należy
STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Przylega do więcej niż jednego istniejącego posterunku
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Zbyt blisko innego posterunku
-STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Nie można budować tutaj posterunku...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Nie można tutaj zbudować posterunku...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Nie można tutaj zbudować posterunku drogowego...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Nie można tutaj ustawić boi...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Nie można zmienić nazwy posterunku...
-STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Nie można usunąć stąd posterunku kolejowego...
-STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Musisz usunąć najpierw posterunek kolejowy
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Nie można stąd usunąć posterunku kolejowego...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Nie można stąd usunąć posterunku drogowego...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Należy najpierw usunąć posterunek kolejowy
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Należy najpierw usunąć posterunek drogowy
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... boja na drodze
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... boja w użyciu przez inna firmę!
# Depot related errors
-STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT :{WHITE}Nie można tutaj wybudować warsztatów kolejowych...
+STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT :{WHITE}Nie można tutaj zbudować warsztatów kolejowych...
STR_ERROR_CAN_T_BUILD_ROAD_DEPOT :{WHITE}Nie można tutaj zbudować zajezdni...
STR_ERROR_CAN_T_BUILD_TRAM_DEPOT :{WHITE}Nie można tutaj zbudować zajezdni tramwajowej...
-STR_ERROR_CAN_T_BUILD_SHIP_DEPOT :{WHITE}Nie można tutaj wybudować stoczni...
+STR_ERROR_CAN_T_BUILD_SHIP_DEPOT :{WHITE}Nie można tutaj zbudować stoczni...
STR_ERROR_CAN_T_RENAME_DEPOT :{WHITE}Nie można zmienić nazwy warsztatów...
@@ -5529,13 +5536,13 @@ STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}Nowy poj
# Rail construction errors
STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Niemożliwa kombinacja torów
STR_ERROR_MUST_REMOVE_SIGNALS_FIRST :{WHITE}Należy najpierw usunąć sygnalizację
-STR_ERROR_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Nieodpowiednie tory/brak torów
+STR_ERROR_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Brak odpowiednich torów kolejowych
STR_ERROR_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Należy najpierw usunąć tory
STR_ERROR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Droga jest jednokierunkowa lub zablokowana
STR_ERROR_CROSSING_DISALLOWED_RAIL :{WHITE}Przejazd kolejowy nie dozwolony dla tego typu torów
STR_ERROR_CROSSING_DISALLOWED_ROAD :{WHITE}Przejazdy kolejowe nie są dozwolone dla tego typu drogi
STR_ERROR_CAN_T_BUILD_SIGNALS_HERE :{WHITE}Nie można tutaj postawić sygnałów...
-STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK :{WHITE}Nie można tutaj ułożyć torów...
+STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK :{WHITE}Nie można tutaj zbudować torów...
STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK :{WHITE}Nie można stąd usunąć torów...
STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM :{WHITE}Nie można stąd usunąć sygnałów...
STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE :{WHITE}Nie można tutaj zmienić sygnałów...
@@ -5562,13 +5569,13 @@ STR_ERROR_NO_SUITABLE_TRAMWAY :{WHITE}Brak wł
STR_ERROR_CAN_T_BUILD_CANALS :{WHITE}Nie można tutaj zbudować kanału...
STR_ERROR_CAN_T_BUILD_LOCKS :{WHITE}Nie można tutaj zbudować śluzy...
STR_ERROR_CAN_T_PLACE_RIVERS :{WHITE}Nie można tutaj umieścić rzeki...
-STR_ERROR_MUST_BE_BUILT_ON_WATER :{WHITE}... musi być wybudowane na wodzie
+STR_ERROR_MUST_BE_BUILT_ON_WATER :{WHITE}... można zbudować tylko na wodzie
STR_ERROR_CAN_T_BUILD_ON_WATER :{WHITE}... nie można zbudować na wodzie
STR_ERROR_CAN_T_BUILD_ON_SEA :{WHITE}... nie można zbudować na otwartym morzu
STR_ERROR_CAN_T_BUILD_ON_CANAL :{WHITE}... nie można zbudować na kanale
STR_ERROR_CAN_T_BUILD_ON_RIVER :{WHITE}... nie można budować na rzece
STR_ERROR_MUST_DEMOLISH_CANAL_FIRST :{WHITE}Należy najpierw usunąć kanał
-STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE :{WHITE}Nie można zbudować tutaj akweduktu...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE :{WHITE}Nie można tutaj zbudować akweduktu...
# Tree related errors
STR_ERROR_TREE_ALREADY_HERE :{WHITE}... drzewo już tu jest
@@ -5576,7 +5583,7 @@ STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE :{WHITE}... niew
STR_ERROR_CAN_T_PLANT_TREE_HERE :{WHITE}Nie można posadzić drzewa...
# Bridge related errors
-STR_ERROR_CAN_T_BUILD_BRIDGE_HERE :{WHITE}Nie można tutaj wybudować mostu...
+STR_ERROR_CAN_T_BUILD_BRIDGE_HERE :{WHITE}Nie można tutaj zbudować mostu...
STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Należy najpierw usunąć most
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
@@ -5588,7 +5595,7 @@ STR_ERROR_BRIDGE_TOO_LONG :{WHITE}... za d
STR_ERROR_BRIDGE_THROUGH_MAP_BORDER :{WHITE}Koniec mostu poza mapą
# Tunnel related errors
-STR_ERROR_CAN_T_BUILD_TUNNEL_HERE :{WHITE}Nie można tutaj wybudować tunelu...
+STR_ERROR_CAN_T_BUILD_TUNNEL_HERE :{WHITE}Nie można tutaj zbudować tunelu...
STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Nieodpowiednie miejsce na wejście tunelu
STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Należy najpierw usunąć tunel
STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY :{WHITE}Inny tunel na drodze
@@ -5729,7 +5736,8 @@ STR_ERROR_NO_STOP_COMPATIBLE_TRAM_TYPE :{WHITE}Brak odp
STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Brak przystanków przeznaczonych dla pojazdów przegubowych.{}Pojazdy przegubowe wymagają przystanku przelotowego, a nie zatokowego
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Ten samolot nie może wylądować na tym lądowisku
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Ten helikopter nie może wylądować na tym lotnisku
-STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Brak posterunku kolejowego
+STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Brak posterunków kolejowych
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Brak posterunków drogowych
STR_ERROR_NO_BUOY :{WHITE}Brak boi
# Timetable related errors
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 375f894a11..515afc2583 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -624,14 +624,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Desativar tudo
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Mostrar todas as cargas no gráfico de tarifas por carga
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Não mostrar carga no gráfico de tarifas por carga
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Mostrar/ocultar gráfico para o tipo de carga
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Alternar o gráfico para este tipo de carga
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Exibir classificações detalhadas de desempenho
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Chave dos gráficos da empresa
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Clique aqui para mostrar/ocultar empresa no gráfico
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Alternar o gráfico desta empresa
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Classificação de Empresas
@@ -711,7 +711,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Seleccio
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Seleccionar programa 'Ezy Street'
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Seleccionar programa 'Personalizado 1'
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Seleccionar programa 'Personalizado 2'
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Ligar/Desligar programa aleatório
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Alternar programa aleatório
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Mostrar janela de selecção de faixas de música
# Playlist window
@@ -794,7 +794,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Deserto
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Neve
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Mostrar/ocultar nomes das localidades no mapa
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Alternar exibição dos nomes das localidades
STR_SMALLMAP_CENTER :{BLACK}Centrar o mapa na posição actual
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -803,9 +803,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Desativar tudo
STR_SMALLMAP_ENABLE_ALL :{BLACK}Ativar tudo
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Mostrar altura
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Mostrar nomes das indústrias
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Não mostrar indústrias no mapa
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Mostrar todas as indústrias no mapa
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Alternar a disposição do mapa de alturas
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Alternar exibição dos nomes das indústrias
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Mostrar propriedades que não sejam de empresas no mapa
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Mostrar todos as propriedades da empresa no mapa
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Não mostrar cargas no mapa
@@ -1381,8 +1383,8 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :Nenhum
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :Como as outras
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Em prospeção
-STR_CONFIG_SETTING_INDUSTRY_PLATFORM :Área plana à volta das industrias: {STRING}
-STR_CONFIG_SETTING_INDUSTRY_PLATFORM_HELPTEXT :Quantidade de terreno plano á volta de uma industria. Isto garante que terreno vazio esteja disponível para construir linhas, etc
+STR_CONFIG_SETTING_INDUSTRY_PLATFORM :Área plana à volta das indústrias: {STRING}
+STR_CONFIG_SETTING_INDUSTRY_PLATFORM_HELPTEXT :Quantidade de terreno plano à volta de uma indústria. Isto garante um espaço vazio à volta de uma indústria, permanecerá disponível para construção de linhas, etc
STR_CONFIG_SETTING_MULTIPINDTOWN :Permitir várias indústrias semelhantes por localidade: {STRING}
STR_CONFIG_SETTING_MULTIPINDTOWN_HELPTEXT :Normalmente, uma localidade não aceita mais do que uma indústria de cada tipo. Com esta configuração, será possível ter várias indústrias do mesmo tipo na mesma localidade
@@ -2130,7 +2132,7 @@ STR_CONFIG_SETTING_ENVIRONMENT :Meio Ambiente
STR_CONFIG_SETTING_ENVIRONMENT_TIME :Tempo
STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoridades
STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Localidades
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrias
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Indústrias
STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribuição de Carga
STR_CONFIG_SETTING_ENVIRONMENT_TREES :Árvores
STR_CONFIG_SETTING_AI :Oponentes
@@ -2885,6 +2887,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Construi
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Construir carris para elétricos usando o modo automático. Ctrl+Clique para remover secção de carris para elétricos. Pressione também Shift para apenas mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construir garagem rodoviária (para compra e manutenção de veículos rodoviários). Pressione também Shift para apenas mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construir garagem para elétricos (para compra e manutenção). Pressione também Shift para apenas mostrar o custo estimado
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Construir ponto de controlo na estrada. Ctrl+Clique para selecionar outro ponto de controlo para se unir. Pressione também Shift para apenas mostrar o custo estimado
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Construir ponto de controlo na linha de elétrico. Ctrl+Clique para selecionar outro ponto de controlo para se unir. Pressione também Shift para apenas mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Construir estação de autocarros. Ctrl+Clique para selecionar outra estação para se unir. Pressione também Shift para apenas mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construir paragem de elétricos para passageiros. Ctrl+Clique para selecionar outra estação para se unir. Pressione também Shift para apenas mostrar o custo estimado
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Construir estação de camiões. Ctrl+Clique para selecionar outra estação para se unir. Pressione também Shift para apenas mostrar o custo estimado
@@ -3617,7 +3621,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ir para
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Introduza um nome para o letreiro
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Localidades
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Localidades ({COMMA} de {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Nenhuma -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Cidade){BLACK} ({COMMA})
@@ -3951,7 +3955,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/período
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Indústrias
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Indústrias ({COMMA} de {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nenhuma -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportado){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5092,12 +5096,15 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST :{WHITE}Precisa
STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Junta mais do que um ponto de controlo existente
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Demasiado perto de outro ponto de controlo
-STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Não é possível construir ponto de controlo de comboio aqui...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Não é possível construir ponto de controlo ferroviário aqui...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Não é possível construir ponto de controlo rodoviário aqui...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Não é possível colocar uma boia aqui...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Não é possível alterar o nome do ponto de controlo...
-STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Não é possível remover ponto de controlo de comboio aqui...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Não é possível remover ponto de controlo ferroviário daqui...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Não é possível remover ponto de controlo rodoviário daqui...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}É preciso remover o ponto de controlo primeiro
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Deverá remover o ponto de controlo rodoviário primeiro
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... boia no caminho
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... boia está a ser usada por outra empresa!
@@ -5345,6 +5352,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Não exi
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Este avião não pode aterrar neste heliporto
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Este helicóptero não pode aterrar neste aeroporto
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Não existe ponto de controlo ferroviário
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Não existe ponto de controlo rodoviário
STR_ERROR_NO_BUOY :{WHITE}Não existe uma boia
# Timetable related errors
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 3a400d6658..581f9b6d7a 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -3566,7 +3566,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Mergi la
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Introdu un nume pentru semn
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Orașe
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Nimic -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (oraș){BLACK} ({COMMA})
@@ -3900,7 +3899,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/perioadă
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrii
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nimic-
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportat){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 98f6f15c95..21fd061e65 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -947,9 +947,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}Выключить все
STR_SMALLMAP_ENABLE_ALL :{BLACK}Включить все
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}Рельеф
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}Показывать названия предприятий
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}Скрыть все предприятия на карте
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}Показать все предприятия на карте
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Отображение рельефа на карте
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}Показать/убрать названия предприятий
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Скрыть собственность всех компаний
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Показать собственность всех компаний на карте
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Не отображать грузы на карте
@@ -3055,6 +3057,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}Стро
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}Строительство трамвайных путей в автоматическом режиме. Ctrl+щелчок - удаление путей. При нажатом Shift - оценка стоимости строительства.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Строительство гаражей (для приобретения и обслуживания автомобилей). При нажатом Shift{NBSP}- оценка стоимости строительства.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Строительство трамвайных депо (для приобретения и обслуживания трамваев). При нажатом Shift - оценка стоимости строительства.
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}Установка маршрутных точек на дорогах. Ctrl+щелчок по другой точке объединит их. При нажатом Shift - оценка стоимости строительства.
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}Установка маршрутных точек на трамвайных путях. Ctrl+щелчок по другой точке объединит их. При нажатом Shift - оценка стоимости строительства.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}Строительство автобусных остановок. Ctrl+щелчок - объединение новой остановки с существующей. Shift+щелчок - оценка стоимости строительства.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Строительство трамвайных остановок. Ctrl+щелчок - объединение новой остановки с существующей. Shift+щелчок - оценка стоимости строительства.
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Строительство грузовых терминалов. Ctrl+щелчок - объединение нового терминала с существующим. Shift+щелчок - оценка стоимости строительства.
@@ -3791,7 +3795,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}К пр
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Введите название таблички
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Города
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Города ({COMMA} / {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Нет -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Мегаполис){BLACK} ({COMMA})
@@ -4125,7 +4129,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/цикл
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Предприятия
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Предприятия ({COMMA} / {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Нет -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% перевезено){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5279,11 +5283,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Прим
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Слишком близко к другой маршрутной точке
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Здесь невозможно поставить маршрутную точку...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Здесь невозможно поставить маршрутную точку...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Не удалось установить здесь буй...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Невозможно переименовать маршрутную точку...
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Невозможно удалить маршрутную точку...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Невозможно удалить маршрутную точку...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Сначала удалите маршрутную точку
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Сначала удалите маршрутную точку
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... буй мешает
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... этот буй используется другой компанией!
@@ -5531,6 +5538,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Отсу
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Этот самолёт не может приземлиться на вертолётной площадке
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Этот вертолёт не может приземлиться в данном аэропорту
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Маршрутные точки отсутствуют
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Маршрутные точки отсутствуют
STR_ERROR_NO_BUOY :{WHITE}Буи отсутствуют
# Timetable related errors
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 970dac7f4f..2ce87bd0be 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -3698,7 +3698,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Položaj
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Unos naziva znaka
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Naselja
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Prazno -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (City){BLACK} ({COMMA})
@@ -4024,7 +4023,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/period
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Fabrike
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nema -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% prevezeno){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 1a4abb28c4..3b5f67dd80 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -623,14 +623,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}全部禁用
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}在货物运输价格表中显示所有货物
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}在货物运费表中隐藏所有货物
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}切换是否显示某种货物
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}切换显示货物
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}查看详细数据
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}公司图表索引
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}点击这里切换显示公司
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}切换显示公司
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}公司评价排名
@@ -710,7 +710,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}选择
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}选择“Ezy街头”风格的音乐列表
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}选择“自定义1”（用户定义）的列表
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}选择“自定义2”（用户定义）的列表
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}开启/关闭 随机播放列表中的曲目
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}开关播放清单随机播放
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}打开音乐选单窗口
# Playlist window
@@ -793,7 +793,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}沙漠
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}雪地
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}切换是否显示城镇名称
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}切换城镇名称
STR_SMALLMAP_CENTER :{BLACK}在地图中心点显示当前位置
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -802,9 +802,11 @@ STR_SMALLMAP_TOWN :{TINY_FONT}{WHI
STR_SMALLMAP_DISABLE_ALL :{BLACK}全部禁用
STR_SMALLMAP_ENABLE_ALL :{BLACK}全部启用
STR_SMALLMAP_SHOW_HEIGHT :{BLACK}显示高度
+STR_SMALLMAP_SHOW_INDUSTRY_NAMES :{BLACK}显示工业名称
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES :{BLACK}在地图上不显示工业设施
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES :{BLACK}在地图上显示所有工业设施
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}切换高度图显示
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES :{BLACK}切换工业名称
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}在地图上不显示任何公司
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}在地图上显示所有公司
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}地图上不显示客货流
@@ -1488,6 +1490,8 @@ STR_CONFIG_SETTING_WARN_INCOME_LESS :若线路亏损
STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT :“打开”，当一辆车在一年内总体亏损，发出提示
STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT_PERIOD :启用时，若某载具在一周期内总体亏损，发出提示
+STR_CONFIG_SETTING_WARN_OLD_VEHICLE :载具老化时发出提示：{STRING}
+STR_CONFIG_SETTING_WARN_OLD_VEHICLE_HELPTEXT :启用时后将会在载具老化时发出提示
STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :载具永不过期：{STRING}
STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES_HELPTEXT :启用时，所有载具一经面世，就可以永远选择购买使用。
@@ -2882,6 +2886,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD :{BLACK}使用
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM :{BLACK}使用多向轨道工具建设电车轨道。按住 键操作以移除电车轨道。按住 键操作以显示预计费用。
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}建设汽车车库（可以购买或维护车辆）。按住 键以显示预计费用。
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}建造电车车库（可以购买与维护车辆）。按住 键以显示预计费用。
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT :{BLACK}建设道路路点。按住 键以合并路点。按住 键以显示预计费用
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT :{BLACK}建设电车路点。按住 键以合并路点。按住 键以显示预计费用
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION :{BLACK}建设公共汽车站。按住 键操作以合并车站。按住 键操作以显示预计费用。
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}建设客运电车站。按住 键操作以合并车站。按住 键操作以显示预计费用。
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}建设汽车货场。按住 键点击以合并车站，按住 键以显示预计费用。
@@ -3614,7 +3620,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}前往
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}为标记起名
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}城镇
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}城镇（{COMMA} 座，共 {COMMA}座）
STR_TOWN_DIRECTORY_NONE :{ORANGE}- 没有 -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (都市){BLACK} ({COMMA})
@@ -3948,7 +3954,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/周期
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}工业设施
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}工业（{COMMA} 座，共 {COMMA} 座）
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- 没有 -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW}（{COMMA}% 已运输）{BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5090,11 +5096,14 @@ STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}距离
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}距离另一路点过近
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}不能在这里设置路点……
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}不能在这里设置路点……
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}不能将浮标放置在这里。
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}不能更改路点名称……
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}不能从这里拆除路点……
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}不能移除这里的道路路点……
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}必须先拆除铁路路点
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}必须先拆除道路路点
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}指定的位置有浮标……
STR_ERROR_BUOY_IS_IN_USE :{WHITE}…… 浮标正在被其他公司使用
@@ -5342,6 +5351,7 @@ STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}没有
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}这架飞机不能降落在这个直升机场
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}这架直升机不能降落在这个机场
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}没有铁路路点
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}没有道路路点
STR_ERROR_NO_BUOY :{WHITE}没有浮标
# Timetable related errors
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 4deecab28e..8434a6d57e 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -3652,7 +3652,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Prejsť
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Zadajte názov pre popis
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Mestá
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Žiadne -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Veľkomesto){BLACK} ({COMMA})
@@ -3986,7 +3985,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/obdobie
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Priemysel
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Nič -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% prepraven{P é é ých}){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index b0bdd899c2..4052ce9788 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -3172,7 +3172,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Pojdi na
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Vpiši ime za znak
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Mesta
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Brez -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Mesto){BLACK} ({COMMA})
@@ -3450,7 +3449,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Polja po
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Letališča
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrije
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Brez -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 8cd4c1e664..20a4d37ebf 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -3578,7 +3578,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ir al le
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Introduce un nombre para el letrero
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Municipios
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ninguna -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Ciudad){BLACK} ({COMMA})
@@ -3912,7 +3911,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periodo
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrias
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ninguna -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportado){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt
index 0abcb8530c..c7fa6a49f5 100644
--- a/src/lang/spanish_MX.txt
+++ b/src/lang/spanish_MX.txt
@@ -3508,7 +3508,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ir al ca
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Indicar un nombre para el cartel
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Localidades
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ninguno -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (ciudad){BLACK} ({COMMA})
@@ -3824,7 +3823,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periodo
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrias
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Ninguna -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportad{G 0 o a}{P 0 "" s}){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index d495e44d92..85c78e7793 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -623,14 +623,14 @@ STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLA
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Inaktivera alla
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Visa alla godstyper på grafen över fraktförtjänster
STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Visa inga godstyper på grafen över fraktförtjänster
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Växla graf för godstyp av/på
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Slå på/av denna godstyps graf
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Visa detaljerad prestationsgradering
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Nyckel till företagsgrafer
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klicka här för att visa/dölja företaget i grafen
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Slå på/av detta företags graf
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Företagstabell
@@ -793,7 +793,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLACK}Öken
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Snö
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Växla stadsnamn på/av på kartan
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Slå på/av visning av stadsnamn
STR_SMALLMAP_CENTER :{BLACK}Centrera minikartan på den nuvarande positionen
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
@@ -3616,7 +3616,7 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Åk till
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Mata in ett namn för skylten
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Städer
+STR_TOWN_DIRECTORY_CAPTION :{WHITE}Städer ({COMMA} av {COMMA})
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Inga -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Stad){BLACK} ({COMMA})
@@ -3950,7 +3950,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/period
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrier
+STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industrier ({COMMA} av {COMMA})
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Inga -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transporterat){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
@@ -5091,12 +5091,15 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST :{WHITE}Måste r
STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Gränsar mot mer än ett existerande riktmärke
STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}... för nära ett annat riktmärke
-STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Kan inte bygga riktmärke här...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}Kan inte bygga järnvägsriktmärke här...
+STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT :{WHITE}Kan inte bygga vägriktmärke här...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}Kan inte placera boj här...
STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Kan inte ändra riktmärkets namn...
-STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Kan inte ta bort riktmärke här...
-STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Måste ta bort riktmärke först
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Kan inte ta bort järnvägsriktmärke här...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT :{WHITE}Kan inte ta bort vägriktmärke här...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Måste ta bort järnvägsriktmärke först
+STR_ERROR_MUST_REMOVE_ROADWAYPOINT_FIRST :{WHITE}Måste ta bort vägriktmärke först
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... boj i vägen
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... bojen används av ett annat företag!
@@ -5343,7 +5346,8 @@ STR_ERROR_NO_STOP_COMPATIBLE_TRAM_TYPE :{WHITE}Det finn
STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Det finns inga hållplatser som passar för ledade vägfordon.{}Ledade vägfordon kräver genomfartshållplatser, inte lastbryggor
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Det här flygplanet kan inte landa på den här helikopterflygplatsen
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Den här helikoptern kan inte landa på den här flygplatsen
-STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Det finns inget riktmärke
+STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Det finns inget järnvägsriktmärke
+STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Det finns inget vägriktmärke
STR_ERROR_NO_BUOY :{WHITE}Det finns ingen boj
# Timetable related errors
diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt
index 215635a72e..04f781f8e2 100644
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -3263,7 +3263,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}மு
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}குறியிற்கு பெயரிடவும்
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}நகரங்கள்
STR_TOWN_DIRECTORY_NONE :{ORANGE}- ஒன்றுமில்லை -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (மாநகரம்){BLACK} ({COMMA})
@@ -3575,7 +3574,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/காலத்திற்கு
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}தொழிற்சாலைகள்
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- ஒன்றுமில்லை -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% கொண்டு செல்லப்பட்டது){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/thai.txt b/src/lang/thai.txt
index f219adbb85..5fec5c13b1 100644
--- a/src/lang/thai.txt
+++ b/src/lang/thai.txt
@@ -3099,7 +3099,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}ไป
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}กรอกชื่อสำหรับป้าย
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}เมือง
STR_TOWN_DIRECTORY_NONE :{ORANGE}- ไม่มี -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (เมือง){BLACK} ({COMMA})
@@ -3384,7 +3383,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}ชิ
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}ท่าอากาศยาน
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}อุตสาหกรรม
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- ไม่มี -
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index a4a591ccc0..ffd06b5ecb 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -3458,7 +3458,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}前往
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}輸入標誌名稱
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}城市
STR_TOWN_DIRECTORY_NONE :{ORANGE}- 無 -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (城市){BLACK} ({COMMA})
@@ -3771,7 +3770,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/週期
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}工業
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- 無 -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} (運送了{COMMA}%){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 1cfb7a559e..568788d5c7 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -3577,7 +3577,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Önceki
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Tabela için bir isim girin
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Şehirler
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Hiçbiri -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Şehir){BLACK} ({COMMA})
@@ -3911,7 +3910,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/periyot
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Fabrikalar
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Hiçbiri -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% taşındı){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 5cbeebb561..55ec0afd81 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -3713,7 +3713,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Попе
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Введіть назву знака
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Міста
STR_TOWN_DIRECTORY_NONE :{ORANGE}- немає -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Мегаполіс){BLACK} ({COMMA})
@@ -4047,7 +4046,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/період
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Підприємства
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- немає -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% перевезено){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt
index e4cd77f163..8bd3904273 100644
--- a/src/lang/urdu.txt
+++ b/src/lang/urdu.txt
@@ -2319,7 +2319,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK} پچھ
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK} اشارے کا نام درج کیجیئے
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE} قصبے
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
# Town view window
diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt
index 13a45998de..f2fe188be1 100644
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -3592,7 +3592,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Biển h
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Nhập tên của biển hiệu
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Đô Thị
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Không Có -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (đô thị){BLACK} ({COMMA})
@@ -3926,7 +3925,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/chu kỳ
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Nhà máy
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Không Có -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% đã vận chuyển){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index 05ae5f81f8..96fde4f2bb 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -3585,7 +3585,6 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Mynd i'r
STR_EDIT_SIGN_SIGN_OSKTITLE :{BLACK}Rhowch enw ar gyfer yr arwydd
# Town directory window
-STR_TOWN_DIRECTORY_CAPTION :{WHITE}Trefi
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Dim -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (Dinas){BLACK} ({COMMA})
@@ -3919,7 +3918,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENC
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/cyfnod
# Industry directory
-STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Diwydiannau
STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Dim -
STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% wedi'i gludo){BLACK}
STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY}
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index beeb2ba83c..ff200757b3 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -106,10 +106,11 @@ void CcPlaySound_EXPLOSION(const CommandCost &result, TileIndex tile, uint32_t p
* Zooms a viewport in a window in or out.
* @param how Zooming direction.
* @param w Window owning the viewport.
+ * @param stop_following Should we stop following the vehicle in the viewport?
* @return Returns \c true if zooming step could be done, \c false if further zooming is not possible.
* @note No button handling or what so ever is done.
*/
-bool DoZoomInOutWindow(ZoomStateChange how, Window *w)
+bool DoZoomInOutWindow(ZoomStateChange how, Window *w, bool stop_following)
{
Viewport *vp;
@@ -131,10 +132,11 @@ bool DoZoomInOutWindow(ZoomStateChange how, Window *w)
w->viewport->scrollpos_y += vp->virtual_height >> 1;
w->viewport->dest_scrollpos_x = w->viewport->scrollpos_x;
w->viewport->dest_scrollpos_y = w->viewport->scrollpos_y;
- w->viewport->follow_vehicle = INVALID_VEHICLE;
+ if (stop_following) w->viewport->follow_vehicle = INVALID_VEHICLE;
break;
case ZOOM_OUT:
if (vp->zoom >= _settings_client.gui.zoom_max) return false;
+ if (w->window_class != WC_MAIN_WINDOW && w->window_class != WC_EXTRA_VIEWPORT && vp->zoom >= ZOOM_LVL_DRAW_SPR) return false;
vp->zoom = (ZoomLevel)((int)vp->zoom + 1);
w->viewport->scrollpos_x -= vp->virtual_width >> 1;
@@ -144,7 +146,7 @@ bool DoZoomInOutWindow(ZoomStateChange how, Window *w)
vp->virtual_width <<= 1;
vp->virtual_height <<= 1;
- w->viewport->follow_vehicle = INVALID_VEHICLE;
+ if (stop_following) w->viewport->follow_vehicle = INVALID_VEHICLE;
break;
}
if (vp != nullptr) { // the vp can be null when how == ZOOM_NONE
@@ -507,7 +509,7 @@ struct MainWindow : Window
/* Cycle through the drawing modes */
ChangeRenderMode(this->viewport, wheel < 0);
this->SetDirty();
- } else if (_settings_client.gui.scrollwheel_scrolling != 2) {
+ } else if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
ZoomInOrOutToCursorWindow(wheel < 0, this);
}
}
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index b3bdf1b805..e01fe80347 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -5214,7 +5214,7 @@ static ChangeInfoResult RoadStopChangeInfo(uint id, int numinfo, int prop, const
if (MappedPropertyLengthMismatch(buf, 1, mapping_entry)) break;
[[fallthrough]];
case 0x0C: // The draw mode
- rs->draw_mode = (RoadStopDrawMode)buf.ReadByte();
+ rs->draw_mode = static_cast(buf.ReadByte());
break;
case A0RPI_ROADSTOP_TRIGGER_CARGOES:
@@ -5257,7 +5257,7 @@ static ChangeInfoResult RoadStopChangeInfo(uint id, int numinfo, int prop, const
if (MappedPropertyLengthMismatch(buf, 4, mapping_entry)) break;
[[fallthrough]];
case 0x12: // General flags
- rs->flags = (uint16_t)buf.ReadDWord(); // Future-proofing, size this as 4 bytes, but we only need two bytes' worth of flags at present
+ rs->flags = (uint16_t)buf.ReadDWord(); // Future-proofing, size this as 4 bytes, but we only need two byte's worth of flags at present
break;
case A0RPI_ROADSTOP_MIN_BRIDGE_HEIGHT:
@@ -7333,6 +7333,7 @@ static constexpr auto _action5_types = std::to_array({
/* 0x16 */ { A5BLOCK_ALLOW_OFFSET, SPR_AIRPORT_PREVIEW_BASE, 1, SPR_AIRPORT_PREVIEW_COUNT, "Airport preview graphics" },
/* 0x17 */ { A5BLOCK_ALLOW_OFFSET, SPR_RAILTYPE_TUNNEL_BASE, 1, RAILTYPE_TUNNEL_BASE_COUNT, "Railtype tunnel base" },
/* 0x18 */ { A5BLOCK_ALLOW_OFFSET, SPR_PALETTE_BASE, 1, PALETTE_SPRITE_COUNT, "Palette" },
+ /* 0x19 */ { A5BLOCK_ALLOW_OFFSET, SPR_ROAD_WAYPOINTS_BASE, 1, ROAD_WAYPOINTS_SPRITE_COUNT, "Road waypoints" },
});
/**
diff --git a/src/newgrf_roadstop.cpp b/src/newgrf_roadstop.cpp
index a29cc38425..ea86ee3fe9 100644
--- a/src/newgrf_roadstop.cpp
+++ b/src/newgrf_roadstop.cpp
@@ -352,7 +352,7 @@ void DrawRoadStopTile(int x, int y, RoadType roadtype, const RoadStopSpec *spec,
RoadStopDrawMode draw_mode;
if (HasBit(spec->flags, RSF_DRAW_MODE_REGISTER)) {
- draw_mode = (RoadStopDrawMode)GetRegister(0x100);
+ draw_mode = static_cast(GetRegister(0x100));
} else {
draw_mode = spec->draw_mode;
}
diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in
index e09d181ed7..2770710770 100644
--- a/src/os/windows/ottdres.rc.in
+++ b/src/os/windows/ottdres.rc.in
@@ -76,8 +76,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION ${REV_MAJOR},${REV_MINOR},0,${REV_ISODATE}
- PRODUCTVERSION ${REV_MAJOR},${REV_MINOR},0,${REV_ISODATE}
+ FILEVERSION ${REV_MAJOR},${REV_MINOR},${REV_YEAR},${REV_DATE}
+ PRODUCTVERSION ${REV_MAJOR},${REV_MINOR},${REV_YEAR},${REV_DATE}
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/rail.h b/src/rail.h
index 8546169e25..a4b40dddd5 100644
--- a/src/rail.h
+++ b/src/rail.h
@@ -339,9 +339,9 @@ inline const RailTypeInfo *GetRailTypeInfo(RailType railtype)
* Checks if an engine of the given RailType can drive on a tile with a given
* RailType. This would normally just be an equality check, but for electric
* rails (which also support non-electric engines).
- * @return Whether the engine can drive on this tile.
* @param enginetype The RailType of the engine we are considering.
* @param tiletype The RailType of the tile we are considering.
+ * @return Whether the engine can drive on this tile.
*/
inline bool IsCompatibleRail(RailType enginetype, RailType tiletype)
{
@@ -352,9 +352,9 @@ inline bool IsCompatibleRail(RailType enginetype, RailType tiletype)
* Checks if an engine of the given RailType got power on a tile with a given
* RailType. This would normally just be an equality check, but for electric
* rails (which also support non-electric engines).
- * @return Whether the engine got power on this tile.
* @param enginetype The RailType of the engine we are considering.
* @param tiletype The RailType of the tile we are considering.
+ * @return Whether the engine got power on this tile.
*/
inline bool HasPowerOnRail(RailType enginetype, RailType tiletype)
{
diff --git a/src/road.h b/src/road.h
index f665aef9b1..9cda6c234c 100644
--- a/src/road.h
+++ b/src/road.h
@@ -273,9 +273,9 @@ inline const RoadTypeInfo *GetRoadTypeInfo(RoadType roadtype)
* Checks if an engine of the given RoadType got power on a tile with a given
* RoadType. This would normally just be an equality check, but for electrified
* roads (which also support non-electric vehicles).
- * @return Whether the engine got power on this tile.
* @param enginetype The RoadType of the engine we are considering.
* @param tiletype The RoadType of the tile we are considering.
+ * @return Whether the engine got power on this tile.
*/
inline bool HasPowerOnRoad(RoadType enginetype, RoadType tiletype)
{
diff --git a/src/saveload/compat/station_sl_compat.h b/src/saveload/compat/station_sl_compat.h
index 33d37c432e..d596e8bd45 100644
--- a/src/saveload/compat/station_sl_compat.h
+++ b/src/saveload/compat/station_sl_compat.h
@@ -34,12 +34,6 @@ const SaveLoadCompat _station_spec_list_sl_compat[] = {
SLC_VAR("localidx"),
};
-/** Nominal field order for SlRoadStopSpecList. */
-const SaveLoadCompat _station_road_stop_spec_list_sl_compat[] = {
- SLC_VAR("grfid"),
- SLC_VAR("localidx"),
-};
-
/** Original field order for SlStationCargo. */
const SaveLoadCompat _station_cargo_sl_compat[] = {
SLC_VAR("first"),
diff --git a/src/settings_type.h b/src/settings_type.h
index 969553d3df..f569c36275 100644
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -131,6 +131,13 @@ enum ViewportScrollMode {
VSM_END, ///< Number of scroll mode settings.
};
+/** Settings related to scroll wheel behavior. */
+enum ScrollWheelScrollingSetting {
+ SWS_ZOOM_MAP = 0, ///< Scroll wheel zooms the map.
+ SWS_SCROLL_MAP = 1, ///< Scroll wheel scrolls the map.
+ SWS_OFF = 2 ///< Scroll wheel has no effect.
+};
+
enum ShowSignalDefaultMode {
SSDM_OFF,
SSDM_ON,
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 465255ac19..f45d59829f 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -160,6 +160,8 @@ static LegendAndColour _legend_linkstats[NUM_CARGO + lengthof(_linkstat_colours_
LegendAndColour _legend_from_industries[NUM_INDUSTRYTYPES + 1];
/** For connecting industry type to position in industries list(small map legend) */
uint _industry_to_list_pos[NUM_INDUSTRYTYPES];
+/** The string bounding box width for each industry type in the smallmap */
+static uint16_t _industry_to_name_string_width[NUM_INDUSTRYTYPES];
/** Show heightmap in industry and owner mode of smallmap window. */
bool _smallmap_show_heightmap = false;
/** Highlight a specific industry type */
@@ -904,13 +906,13 @@ void SmallMapWindow::DrawVehicles(const DrawPixelInfo *dpi, Blitter *blitter) co
* Adds town names to the smallmap.
* @param dpi the part of the smallmap to be drawn into
*/
-void SmallMapWindow::DrawTowns(const DrawPixelInfo *dpi) const
+void SmallMapWindow::DrawTowns(const DrawPixelInfo *dpi, const int vertical_padding) const
{
for (const Town *t : Town::Iterate()) {
/* Remap the town coordinate */
Point pt = this->TileToPixel(TileX(t->xy) * TILE_SIZE, TileY(t->xy) * TILE_SIZE);
int x = pt.x - (t->cache.sign.width_small >> 1);
- int y = pt.y;
+ int y = pt.y + vertical_padding;
/* Check if the town sign is within bounds */
if (x + t->cache.sign.width_small > dpi->left &&
@@ -924,6 +926,45 @@ void SmallMapWindow::DrawTowns(const DrawPixelInfo *dpi) const
}
}
+/**
+ * Adds industry names to the smallmap.
+ * @param dpi the part of the smallmap to be drawn into
+ */
+void SmallMapWindow::DrawIndustryNames(const DrawPixelInfo *dpi, const int vertical_padding) const
+{
+ if (this->map_type != SMT_INDUSTRY) return;
+
+ for (const Industry *i : Industry::Iterate()) {
+ const LegendAndColour &tbl = _legend_from_industries[_industry_to_list_pos[i->type]];
+ if (!tbl.show_on_map) continue;
+
+ /* Industry names blink together with their blobs in the smallmap. */
+ const bool is_blinking = i->type == _smallmap_industry_highlight && !_smallmap_industry_highlight_state;
+ if (is_blinking) continue;
+
+ if (_industry_to_name_string_width[i->type] == 0) {
+ _industry_to_name_string_width[i->type] = GetStringBoundingBox(tbl.legend, FS_SMALL).width;
+ }
+ const uint16_t &legend_text_width = _industry_to_name_string_width[i->type];
+
+ /* Remap the industry coordinate */
+ const TileIndex &tile = i->location.GetCenterTile();
+ const Point pt = this->TileToPixel(TileX(tile) * TILE_SIZE, TileY(tile) * TILE_SIZE);
+ const int x = pt.x - (legend_text_width / 2);
+ const int y = pt.y + vertical_padding;
+
+ /* Check if the industry name is within bounds */
+ if (x + legend_text_width > dpi->left &&
+ x < dpi->left + dpi->width &&
+ y + GetCharacterHeight(FS_SMALL) > dpi->top &&
+ y < dpi->top + dpi->height) {
+
+ /* And draw it. */
+ DrawString(x, x + legend_text_width, y, tbl.legend, TC_WHITE, SA_LEFT, false, FS_SMALL);
+ }
+ }
+}
+
/**
* Adds map indicators to the smallmap.
*/
@@ -1013,8 +1054,13 @@ void SmallMapWindow::DrawSmallMap(DrawPixelInfo *dpi, bool draw_indicators) cons
this->overlay->Draw(BlitterFactory::GetCurrentBlitter(), dpi);
}
+ const int map_labels_vertical_padding = ScaleGUITrad(2);
+
/* Draw town names */
- if (this->show_towns) this->DrawTowns(dpi);
+ if (this->show_towns) this->DrawTowns(dpi, map_labels_vertical_padding);
+
+ /* Draw industry names */
+ if (this->show_ind_names) this->DrawIndustryNames(dpi, map_labels_vertical_padding);
/* Draw map indicators */
if (draw_indicators) this->DrawMapIndicators();
@@ -1028,41 +1074,47 @@ void SmallMapWindow::SetupWidgetData()
StringID legend_tooltip;
StringID enable_all_tooltip;
StringID disable_all_tooltip;
- int plane;
+ int industry_names_select_plane;
+ int select_buttons_plane;
switch (this->map_type) {
case SMT_INDUSTRY:
legend_tooltip = STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION;
enable_all_tooltip = STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES;
disable_all_tooltip = STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES;
- plane = 0;
+ industry_names_select_plane = 0;
+ select_buttons_plane = 0;
break;
case SMT_OWNER:
legend_tooltip = STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION;
enable_all_tooltip = STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES;
disable_all_tooltip = STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES;
- plane = 0;
+ industry_names_select_plane = SZSP_NONE;
+ select_buttons_plane = 0;
break;
case SMT_LINKSTATS:
legend_tooltip = STR_SMALLMAP_TOOLTIP_CARGO_SELECTION;
enable_all_tooltip = STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS;
disable_all_tooltip = STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS;
- plane = 0;
+ industry_names_select_plane = SZSP_NONE;
+ select_buttons_plane = 0;
break;
default:
legend_tooltip = STR_NULL;
enable_all_tooltip = STR_NULL;
disable_all_tooltip = STR_NULL;
- plane = 1;
+ industry_names_select_plane = SZSP_NONE;
+ select_buttons_plane = 1;
break;
}
this->GetWidget(WID_SM_LEGEND)->SetDataTip(STR_NULL, legend_tooltip);
this->GetWidget(WID_SM_ENABLE_ALL)->SetDataTip(STR_SMALLMAP_ENABLE_ALL, enable_all_tooltip);
this->GetWidget(WID_SM_DISABLE_ALL)->SetDataTip(STR_SMALLMAP_DISABLE_ALL, disable_all_tooltip);
- this->GetWidget(WID_SM_SELECT_BUTTONS)->SetDisplayedPlane(plane);
+ this->GetWidget(WID_SM_SHOW_IND_NAMES_SEL)->SetDisplayedPlane(industry_names_select_plane);
+ this->GetWidget(WID_SM_SELECT_BUTTONS)->SetDisplayedPlane(select_buttons_plane);
}
SmallMapWindow::SmallMapWindow(WindowDesc &desc, int window_number) : Window(desc), refresh(GUITimer())
@@ -1077,6 +1129,7 @@ SmallMapWindow::SmallMapWindow(WindowDesc &desc, int window_number) : Window(des
this->SetWidgetLoweredState(WID_SM_SHOW_HEIGHT, _smallmap_show_heightmap);
this->SetWidgetLoweredState(WID_SM_TOGGLETOWNNAME, this->show_towns);
+ this->SetWidgetLoweredState(WID_SM_SHOW_IND_NAMES, this->show_ind_names);
this->SetupWidgetData();
@@ -1177,6 +1230,9 @@ void SmallMapWindow::RebuildColourIndexIfNecessary()
/* The width of a column is the minimum width of all texts + the size of the blob + some spacing */
this->column_width = min_width + WidgetDimensions::scaled.hsep_normal + this->legend_width + WidgetDimensions::scaled.framerect.Horizontal();
+
+ /* Cached string widths of industry names in the smallmap. Calculation is deferred to DrawIndustryNames(). */
+ std::fill(std::begin(_industry_to_name_string_width), std::end(_industry_to_name_string_width), 0);
}
/* virtual */ void SmallMapWindow::OnPaint()
@@ -1315,7 +1371,7 @@ void SmallMapWindow::SwitchMapType(SmallMapType map_type)
if (map_type == SMT_LINKSTATS) this->overlay->SetDirty();
if (map_type != SMT_INDUSTRY) this->BreakIndustryChainLink();
- this->SetDirty();
+ this->ReInit();
this->refresh.SetInterval(this->GetRefreshPeriod());
}
@@ -1470,6 +1526,14 @@ int SmallMapWindow::GetPositionOnLegend(Point pt)
if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
break;
+ case WID_SM_SHOW_IND_NAMES: // Toggle industry names
+ this->show_ind_names = !this->show_ind_names;
+ this->SetWidgetLoweredState(WID_SM_SHOW_IND_NAMES, this->show_ind_names);
+
+ this->SetDirty();
+ if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+ break;
+
case WID_SM_LEGEND: // Legend
if (this->map_type == SMT_INDUSTRY || this->map_type == SMT_LINKSTATS || this->map_type == SMT_OWNER) {
int click_pos = this->GetPositionOnLegend(pt);
@@ -1578,7 +1642,7 @@ int SmallMapWindow::GetPositionOnLegend(Point pt)
/* virtual */ void SmallMapWindow::OnMouseWheel(int wheel)
{
- if (_settings_client.gui.scrollwheel_scrolling != 2) {
+ if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
const NWidgetBase *wid = this->GetWidget(WID_SM_MAP);
int cursor_x = _cursor.pos.x - this->left - wid->pos_x;
int cursor_y = _cursor.pos.y - this->top - wid->pos_y;
@@ -1740,6 +1804,7 @@ void SmallMapWindow::ScreenshotCallbackHandler(void *buf, uint y, uint pitch, ui
SmallMapType SmallMapWindow::map_type = SMT_CONTOUR;
bool SmallMapWindow::show_towns = true;
+bool SmallMapWindow::show_ind_names = false;
int SmallMapWindow::map_height_limit = -1;
/**
@@ -1880,6 +1945,12 @@ static constexpr NWidgetPart _nested_smallmap_widgets[] = {
NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_SM_ENABLE_ALL), SetDataTip(STR_SMALLMAP_ENABLE_ALL, STR_NULL),
NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_SM_DISABLE_ALL), SetDataTip(STR_SMALLMAP_DISABLE_ALL, STR_NULL),
NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_SM_SHOW_HEIGHT), SetDataTip(STR_SMALLMAP_SHOW_HEIGHT, STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT),
+
+ /* 'show industry names' button and container. Only shown for the industry map type. */
+ NWidget(NWID_SELECTION, INVALID_COLOUR, WID_SM_SHOW_IND_NAMES_SEL),
+ NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_SM_SHOW_IND_NAMES), SetDataTip(STR_SMALLMAP_SHOW_INDUSTRY_NAMES, STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRY_NAMES),
+ EndContainer(),
+
NWidget(WWT_PANEL, COLOUR_BROWN), SetFill(1, 0), SetResize(1, 0),
EndContainer(),
EndContainer(),
diff --git a/src/smallmap_gui.h b/src/smallmap_gui.h
index b483450653..e2378c392e 100644
--- a/src/smallmap_gui.h
+++ b/src/smallmap_gui.h
@@ -89,6 +89,7 @@ protected:
static SmallMapType map_type; ///< Currently displayed legends.
static bool show_towns; ///< Display town names in the smallmap.
+ static bool show_ind_names; ///< Display industry names in the smallmap.
static int map_height_limit; ///< Currently used/cached map height limit.
static const uint INDUSTRY_MIN_NUMBER_OF_COLUMNS = 2; ///< Minimal number of columns in the #WID_SM_LEGEND widget for the #SMT_INDUSTRY legend.
@@ -185,7 +186,8 @@ protected:
void DrawMapIndicators() const;
void DrawSmallMapColumn(void *dst, uint xc, uint yc, int pitch, int reps, int start_pos, int end_pos, int y, int end_y, Blitter *blitter) const;
void DrawVehicles(const DrawPixelInfo *dpi, Blitter *blitter) const;
- void DrawTowns(const DrawPixelInfo *dpi) const;
+ void DrawTowns(const DrawPixelInfo *dpi, const int vertical_padding) const;
+ void DrawIndustryNames(const DrawPixelInfo *dpi, const int vertical_padding) const;
void DrawSmallMap(DrawPixelInfo *dpi, bool draw_indicators = true) const;
Point TileToPixel(int tx, int ty) const;
diff --git a/src/table/settings/gui_settings.ini b/src/table/settings/gui_settings.ini
index 0efeaad9a8..2582c9feab 100644
--- a/src/table/settings/gui_settings.ini
+++ b/src/table/settings/gui_settings.ini
@@ -180,9 +180,9 @@ ifdef = UNIX
var = gui.scroll_mode
type = SLE_UINT8
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
-def = 2
-min = 0
-max = 3
+def = VSM_MAP_RMB
+min = VSM_VIEWPORT_RMB_FIXED
+max = VSM_MAP_LMB
str = STR_CONFIG_SETTING_SCROLLMODE
strhelp = STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT
strval = STR_CONFIG_SETTING_SCROLLMODE_DEFAULT
@@ -193,9 +193,9 @@ ifndef = UNIX
var = gui.scroll_mode
type = SLE_UINT8
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
-def = 0
-min = 0
-max = 3
+def = VSM_VIEWPORT_RMB_FIXED
+min = VSM_VIEWPORT_RMB_FIXED
+max = VSM_MAP_LMB
str = STR_CONFIG_SETTING_SCROLLMODE
strhelp = STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT
strval = STR_CONFIG_SETTING_SCROLLMODE_DEFAULT
@@ -577,9 +577,9 @@ cat = SC_BASIC
var = gui.scrollwheel_scrolling
type = SLE_UINT8
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
-def = 0
-min = 0
-max = 2
+def = SWS_ZOOM_MAP
+min = SWS_ZOOM_MAP
+max = SWS_OFF
str = STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING
strhelp = STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING_HELPTEXT
strval = STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM
diff --git a/src/table/sprites.h b/src/table/sprites.h
index c50cc84483..13fe6df4e6 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -307,8 +307,16 @@ static const uint16_t EMPTY_BOUNDING_BOX_SPRITE_COUNT = 1;
static const SpriteID SPR_PALETTE_BASE = SPR_EMPTY_BOUNDING_BOX + EMPTY_BOUNDING_BOX_SPRITE_COUNT;
static const uint16_t PALETTE_SPRITE_COUNT = 1;
+/** Road waypoint sprites. */
+static const SpriteID SPR_ROAD_WAYPOINTS_BASE = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT;
+static const SpriteID SPR_ROAD_WAYPOINT_Y_W = SPR_ROAD_WAYPOINTS_BASE;
+static const SpriteID SPR_ROAD_WAYPOINT_Y_E = SPR_ROAD_WAYPOINTS_BASE + 1;
+static const SpriteID SPR_ROAD_WAYPOINT_X_W = SPR_ROAD_WAYPOINTS_BASE + 2;
+static const SpriteID SPR_ROAD_WAYPOINT_X_E = SPR_ROAD_WAYPOINTS_BASE + 3;
+static const uint16_t ROAD_WAYPOINTS_SPRITE_COUNT = 4;
+
/* Programmable pre-signal sprites */
-static const SpriteID SPR_PROGSIGNAL_BASE = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT;
+static const SpriteID SPR_PROGSIGNAL_BASE = SPR_ROAD_WAYPOINTS_BASE + ROAD_WAYPOINTS_SPRITE_COUNT;
static const uint16_t PROGSIGNAL_SPRITE_COUNT = 32;
static const SpriteID SPR_DUP_PROGSIGNAL_BASE = SPR_PROGSIGNAL_BASE + PROGSIGNAL_SPRITE_COUNT;
@@ -346,16 +354,8 @@ static const uint16_t TRACERESTRICT_SPRITE_COUNT = 3;
static const SpriteID SPR_MISC_GUI_BASE = SPR_TRACERESTRICT_BASE + TRACERESTRICT_SPRITE_COUNT;
static const uint16_t MISC_GUI_SPRITE_COUNT = 1;
-/* Road waypoints sprites */
-static const SpriteID SPR_ROAD_WAYPOINTS_BASE = SPR_MISC_GUI_BASE + MISC_GUI_SPRITE_COUNT;
-static const SpriteID SPR_ROAD_WAYPOINT_Y_W = SPR_ROAD_WAYPOINTS_BASE;
-static const SpriteID SPR_ROAD_WAYPOINT_Y_E = SPR_ROAD_WAYPOINTS_BASE + 1;
-static const SpriteID SPR_ROAD_WAYPOINT_X_W = SPR_ROAD_WAYPOINTS_BASE + 2;
-static const SpriteID SPR_ROAD_WAYPOINT_X_E = SPR_ROAD_WAYPOINTS_BASE + 3;
-static const uint16_t ROAD_WAYPOINTS_SPRITE_COUNT = 4;
-
/* Duplicated signal sprites */
-static const SpriteID SPR_DUP_ORIGINAL_SIGNALS_BASE = SPR_ROAD_WAYPOINTS_BASE + ROAD_WAYPOINTS_SPRITE_COUNT;
+static const SpriteID SPR_DUP_ORIGINAL_SIGNALS_BASE = SPR_MISC_GUI_BASE + MISC_GUI_SPRITE_COUNT;
static const uint16_t DUP_ORIGINAL_SIGNALS_SPRITE_COUNT = 16;
static const SpriteID SPR_DUP_SIGNALS_BASE = SPR_DUP_ORIGINAL_SIGNALS_BASE + DUP_ORIGINAL_SIGNALS_SPRITE_COUNT;
static const uint16_t DUP_SIGNALS_SPRITE_COUNT = PRESIGNAL_SEMAPHORE_AND_PBS_SPRITE_COUNT;
diff --git a/src/table/station_land.h b/src/table/station_land.h
index 21bc5f34c8..fc47de8d77 100644
--- a/src/table/station_land.h
+++ b/src/table/station_land.h
@@ -763,14 +763,14 @@ static const DrawTileSeqStruct _station_display_datas_0171[] = {
TILE_SEQ_END()
};
-/* drive-through bus stop X */
+/* road waypoint X */
static const DrawTileSeqStruct _station_display_datas_road_waypoint_X[] = {
TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_ROAD_WAYPOINT_X_W | (1U << PALETTE_MODIFIER_COLOUR))
TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_ROAD_WAYPOINT_X_E | (1U << PALETTE_MODIFIER_COLOUR))
TILE_SEQ_END()
};
-/* drive-through bus stop Y */
+/* road waypoint Y */
static const DrawTileSeqStruct _station_display_datas_road_waypoint_Y[] = {
TILE_SEQ_LINE(13, 0, 0, 3, 16, 16, SPR_ROAD_WAYPOINT_Y_W | (1U << PALETTE_MODIFIER_COLOUR))
TILE_SEQ_LINE( 0, 0, 0, 3, 16, 16, SPR_ROAD_WAYPOINT_Y_E | (1U << PALETTE_MODIFIER_COLOUR))
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index b311d16e25..f1179d3700 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -783,6 +783,13 @@ public:
}
}
+ void OnMouseWheel(int wheel) override
+ {
+ if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
+ DoZoomInOutWindow(wheel < 0 ? ZOOM_IN : ZOOM_OUT, this);
+ }
+ }
+
/**
* Some data on this window has become invalid.
* @param data Information about the changed data.
@@ -889,7 +896,7 @@ void ShowTownViewWindow(TownID town)
static constexpr NWidgetPart _nested_town_directory_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
- NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_TOWN_DIRECTORY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TD_CAPTION), SetDataTip(STR_TOWN_DIRECTORY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_SHADEBOX, COLOUR_BROWN),
NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),
NWidget(WWT_STICKYBOX, COLOUR_BROWN),
@@ -904,7 +911,7 @@ static constexpr NWidgetPart _nested_town_directory_widgets[] = {
NWidget(WWT_PANEL, COLOUR_BROWN, WID_TD_LIST), SetDataTip(0x0, STR_TOWN_DIRECTORY_LIST_TOOLTIP),
SetFill(1, 0), SetResize(1, 1), SetScrollbar(WID_TD_SCROLLBAR), EndContainer(),
NWidget(WWT_PANEL, COLOUR_BROWN),
- NWidget(WWT_TEXT, COLOUR_BROWN, WID_TD_WORLD_POPULATION), SetPadding(2, 0, 2, 2), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TOWN_DIRECTORY_INFO, STR_NULL),
+ NWidget(WWT_TEXT, COLOUR_BROWN, WID_TD_WORLD_POPULATION), SetPadding(2, 0, 2, 2), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TOWN_POPULATION, STR_NULL),
EndContainer(),
EndContainer(),
NWidget(NWID_VERTICAL),
@@ -1022,10 +1029,13 @@ public:
void SetStringParameters(WidgetID widget) const override
{
switch (widget) {
+ case WID_TD_CAPTION:
+ SetDParam(0, this->vscroll->GetCount());
+ SetDParam(1, Town::GetNumItems());
+ break;
+
case WID_TD_WORLD_POPULATION:
- SetDParam(0, STR_TOWN_POPULATION);
- SetDParam(1, GetWorldPopulation());
- SetDParam(2, Town::GetNumItems());
+ SetDParam(0, GetWorldPopulation());
break;
case WID_TD_SORT_CRITERIA:
@@ -1129,10 +1139,8 @@ public:
break;
}
case WID_TD_WORLD_POPULATION: {
- SetDParam(0, STR_TOWN_POPULATION);
- SetDParamMaxDigits(1, 10);
- SetDParamMaxDigits(2, 5);
- Dimension d = GetStringBoundingBox(STR_TOWN_DIRECTORY_INFO);
+ SetDParamMaxDigits(0, 10);
+ Dimension d = GetStringBoundingBox(STR_TOWN_POPULATION);
d.width += padding.width;
d.height += padding.height;
size = maxdim(size, d);
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 56ade32c9c..e56d1a87af 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -4410,6 +4410,13 @@ public:
}
}
+ void OnMouseWheel(int wheel) override
+ {
+ if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
+ DoZoomInOutWindow(wheel < 0 ? ZOOM_IN : ZOOM_OUT, this, false);
+ }
+ }
+
void OnResize() override
{
if (this->viewport != nullptr) {
diff --git a/src/viewport_func.h b/src/viewport_func.h
index 6288bbdfae..0b36162c9b 100644
--- a/src/viewport_func.h
+++ b/src/viewport_func.h
@@ -52,7 +52,7 @@ void AddFixedViewportRoutePath(VehicleID veh);
void RemoveFixedViewportRoutePath(VehicleID veh);
void ChangeFixedViewportRoutePath(VehicleID from, VehicleID to);
-bool DoZoomInOutWindow(ZoomStateChange how, Window *w);
+bool DoZoomInOutWindow(ZoomStateChange how, Window *w, bool stop_following = true);
void ZoomInOrOutToCursorWindow(bool in, Window * w);
void ConstrainAllViewportsZoom();
Point GetTileZoomCenterWindow(bool in, Window * w);
diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
index c1c92837e7..0744902048 100644
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -152,7 +152,7 @@ public:
/* Cycle through the drawing modes */
ChangeRenderMode(this->viewport, wheel < 0);
this->SetDirty();
- } else if (_settings_client.gui.scrollwheel_scrolling != 2) {
+ } else if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
ZoomInOrOutToCursorWindow(wheel < 0, this);
}
}
diff --git a/src/widgets/industry_widget.h b/src/widgets/industry_widget.h
index da8de1c58f..85bc99a496 100644
--- a/src/widgets/industry_widget.h
+++ b/src/widgets/industry_widget.h
@@ -33,6 +33,7 @@ enum IndustryViewWidgets : WidgetID {
/** Widgets of the #IndustryDirectoryWindow class. */
enum IndustryDirectoryWidgets : WidgetID {
+ WID_ID_CAPTION, ///< Caption of the window.
WID_ID_DROPDOWN_ORDER, ///< Dropdown for the order of the sort.
WID_ID_DROPDOWN_CRITERIA, ///< Dropdown for the criteria of the sort.
WID_ID_FILTER_BY_ACC_CARGO, ///< Accepted cargo filter dropdown list.
diff --git a/src/widgets/smallmap_widget.h b/src/widgets/smallmap_widget.h
index 5a999a2069..5ddf0e0d3f 100644
--- a/src/widgets/smallmap_widget.h
+++ b/src/widgets/smallmap_widget.h
@@ -32,6 +32,8 @@ enum SmallMapWidgets : WidgetID {
WID_SM_ENABLE_ALL, ///< Button to enable display of all legend entries.
WID_SM_DISABLE_ALL, ///< Button to disable display of all legend entries.
WID_SM_SHOW_HEIGHT, ///< Show heightmap toggle button.
+ WID_SM_SHOW_IND_NAMES, ///< Show industry names toggle button.
+ WID_SM_SHOW_IND_NAMES_SEL, ///< Container for the 'show industry names' button, which can be hidden.
WID_SM_SCREENSHOT, ///< Button to take smallmap screenshots
};
diff --git a/src/widgets/town_widget.h b/src/widgets/town_widget.h
index b52174ba4c..3b4ba50f7e 100644
--- a/src/widgets/town_widget.h
+++ b/src/widgets/town_widget.h
@@ -12,6 +12,7 @@
/** Widgets of the #TownDirectoryWindow class. */
enum TownDirectoryWidgets : WidgetID {
+ WID_TD_CAPTION, ///< Caption of the window.
WID_TD_SORT_ORDER, ///< Direction of sort dropdown.
WID_TD_SORT_CRITERIA, ///< Criteria of sort dropdown.
WID_TD_FILTER, ///< Filter of name.
diff --git a/src/window.cpp b/src/window.cpp
index bdcba6ea1a..f21254dae3 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2515,7 +2515,7 @@ static EventState HandleActiveWidget()
*/
static EventState HandleViewportScroll()
{
- bool scrollwheel_scrolling = _settings_client.gui.scrollwheel_scrolling == 1 && (_cursor.v_wheel != 0 || _cursor.h_wheel != 0);
+ bool scrollwheel_scrolling = _settings_client.gui.scrollwheel_scrolling == SWS_SCROLL_MAP && (_cursor.v_wheel != 0 || _cursor.h_wheel != 0);
if (_scrolling_viewport == nullptr) return ES_NOT_HANDLED;
@@ -2985,7 +2985,7 @@ static void MouseLoop(MouseClick click, int mousewheel)
HandleMouseOver();
- bool scrollwheel_scrolling = _settings_client.gui.scrollwheel_scrolling == 1 && (_cursor.v_wheel != 0 || _cursor.h_wheel != 0);
+ bool scrollwheel_scrolling = _settings_client.gui.scrollwheel_scrolling == SWS_SCROLL_MAP && (_cursor.v_wheel != 0 || _cursor.h_wheel != 0);
if (click == MC_NONE && mousewheel == 0 && !scrollwheel_scrolling) return;
int x = _cursor.pos.x;