dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_engine.cpp
#	src/news_gui.cpp
#	src/order_gui.cpp
#	src/roadveh_cmd.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/statusbar_gui.cpp
#	src/table/settings/network_private_settings.ini
#	src/table/settings/network_settings.ini
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
This commit is contained in:
Jonathan G Rennison
2023-05-31 23:11:44 +01:00
parent 6880cf24a0 045a99dd23
commit 2ed248a61d
163 changed files with 2483 additions and 2703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/extra/english.txt
View File

@@ -1808,7 +1808,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}IM
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}DE
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x
STR_JUST_DECIMAL :{DECIMAL}
STR_JUST_DECIMAL1 :{DECIMAL1}
STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY}

1
src/lang/extra/galician.txt
View File

@@ -1769,7 +1769,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}IM
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}DE
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x
STR_JUST_DECIMAL :{DECIMAL}
STR_JUST_DECIMAL1 :{DECIMAL1}
STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY}

1
src/lang/extra/german.txt
View File

@@ -1634,7 +1634,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}IM
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}DE
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x
STR_JUST_DECIMAL :{DECIMAL}
STR_JUST_DECIMAL1 :{DECIMAL1}
STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY}

1
src/lang/extra/korean.txt
View File

@@ -1770,7 +1770,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}암
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}기
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x
STR_JUST_DECIMAL :{DECIMAL}
STR_JUST_DECIMAL1 :{DECIMAL1}
STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY}

1
src/lang/extra/simplified_chinese.txt
View File

@@ -1719,7 +1719,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}转
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}库
STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x
STR_JUST_DECIMAL :{DECIMAL}
STR_JUST_DECIMAL1 :{DECIMAL1}
STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY}