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 ba8ed880c1 Merge branch 'master' into jgrpp-nrt
Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
5 years ago
..
unfinished Merge branch 'master' into jgrpp-nrt 5 years ago
afrikaans.txt Merge branch 'master' into jgrpp-nrt 5 years ago
arabic_egypt.txt Merge branch 'master' into jgrpp-nrt 5 years ago
basque.txt Merge branch 'master' into jgrpp-nrt 5 years ago
belarusian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
brazilian_portuguese.txt Merge branch 'master' into jgrpp-nrt 5 years ago
bulgarian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
catalan.txt Merge branch 'master' into jgrpp-nrt 5 years ago
croatian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
czech.txt Merge branch 'master' into jgrpp-nrt 5 years ago
danish.txt Merge branch 'master' into jgrpp-nrt 5 years ago
dutch.txt Merge branch 'master' into jgrpp-nrt 5 years ago
english.txt Merge branch 'master' into jgrpp-nrt 5 years ago
english_AU.txt Merge branch 'master' into jgrpp-nrt 5 years ago
english_US.txt Merge branch 'master' into jgrpp-nrt 5 years ago
esperanto.txt Merge branch 'master' into jgrpp-nrt 5 years ago
estonian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
faroese.txt Merge branch 'master' into jgrpp-nrt 5 years ago
finnish.txt Merge branch 'master' into jgrpp-nrt 5 years ago
french.txt Merge branch 'master' into jgrpp-nrt 5 years ago
gaelic.txt Merge branch 'master' into jgrpp-nrt 5 years ago
galician.txt Merge branch 'master' into jgrpp-nrt 5 years ago
german.txt Merge branch 'master' into jgrpp-nrt 5 years ago
greek.txt Merge branch 'master' into jgrpp-nrt 5 years ago
hebrew.txt Merge branch 'master' into jgrpp-nrt 5 years ago
hungarian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
icelandic.txt Merge branch 'master' into jgrpp-nrt 5 years ago
indonesian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
irish.txt Merge branch 'master' into jgrpp-nrt 5 years ago
italian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
japanese.txt Merge branch 'master' into jgrpp-nrt 5 years ago
korean.txt Merge branch 'master' into jgrpp-nrt 5 years ago
latin.txt Merge branch 'master' into jgrpp-nrt 5 years ago
latvian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
lithuanian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
luxembourgish.txt Merge branch 'master' into jgrpp-nrt 5 years ago
malay.txt Merge branch 'master' into jgrpp-nrt 5 years ago
norwegian_bokmal.txt Merge branch 'master' into jgrpp-nrt 5 years ago
norwegian_nynorsk.txt Merge branch 'master' into jgrpp-nrt 5 years ago
polish.txt Merge branch 'master' into jgrpp-nrt 5 years ago
portuguese.txt Merge branch 'master' into jgrpp-nrt 5 years ago
romanian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
russian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
serbian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
simplified_chinese.txt Merge branch 'master' into jgrpp-nrt 5 years ago
slovak.txt Merge branch 'master' into jgrpp-nrt 5 years ago
slovenian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
spanish.txt Merge branch 'master' into jgrpp-nrt 5 years ago
spanish_MX.txt Merge branch 'master' into jgrpp-nrt 5 years ago
swedish.txt Merge branch 'master' into jgrpp-nrt 5 years ago
tamil.txt Merge branch 'master' into jgrpp-nrt 5 years ago
thai.txt Merge branch 'master' into jgrpp-nrt 5 years ago
traditional_chinese.txt Merge branch 'master' into jgrpp-nrt 5 years ago
turkish.txt Merge branch 'master' into jgrpp-nrt 5 years ago
ukrainian.txt Merge branch 'master' into jgrpp-nrt 5 years ago
vietnamese.txt Merge branch 'master' into jgrpp-nrt 5 years ago
welsh.txt Merge branch 'master' into jgrpp-nrt 5 years ago