You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/src/lang
Jonathan G Rennison 7154f8859d Merge tag '1.11.0-beta1' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp
3 years ago
..
unfinished Merge tag '1.11.0-beta1' into jgrpp 3 years ago
CMakeLists.txt Merge branch 'master' into jgrpp 4 years ago
afrikaans.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
arabic_egypt.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
basque.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
belarusian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
brazilian_portuguese.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
bulgarian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
catalan.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
croatian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
czech.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
danish.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
dutch.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
english.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
english_AU.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
english_US.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
esperanto.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
estonian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
faroese.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
finnish.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
french.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
gaelic.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
galician.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
german.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
greek.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
hebrew.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
hungarian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
icelandic.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
indonesian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
irish.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
italian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
japanese.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
korean.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
latin.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
latvian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
lithuanian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
luxembourgish.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
malay.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
norwegian_bokmal.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
norwegian_nynorsk.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
polish.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
portuguese.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
romanian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
russian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
serbian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
simplified_chinese.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
slovak.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
slovenian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
spanish.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
spanish_MX.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
swedish.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
tamil.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
thai.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
traditional_chinese.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
turkish.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
ukrainian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
vietnamese.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
welsh.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago