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 9e946d4c5d Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/command.cpp
#	src/console_cmds.cpp
#	src/group_gui.cpp
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/greek.txt
#	src/lang/hungarian.txt
#	src/lang/irish.txt
#	src/lang/japanese.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/saveload/afterload.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/script/script_instance.cpp
#	src/toolbar_gui.cpp
#	src/toolbar_gui.h
#	src/vehicle_gui.cpp
#	src/widgets/rail_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
3 years ago
..
CMakeLists.txt Merge branch 'master' into jgrpp 3 years ago
afrikaans.txt Merge branch 'master' into jgrpp-beta 3 years ago
arabic_egypt.txt Merge branch 'master' into jgrpp-beta 3 years ago
basque.txt Merge branch 'master' into jgrpp-beta 3 years ago
belarusian.txt Merge branch 'master' into jgrpp-beta 3 years ago
brazilian_portuguese.txt Merge branch 'master' into jgrpp-beta 3 years ago
bulgarian.txt Merge branch 'master' into jgrpp-beta 3 years ago
catalan.txt Merge branch 'master' into jgrpp-beta 3 years ago
chuvash.txt Merge branch 'master' into jgrpp-beta 3 years ago
croatian.txt Merge branch 'master' into jgrpp-beta 3 years ago
czech.txt Merge branch 'master' into jgrpp-beta 3 years ago
danish.txt Merge branch 'master' into jgrpp-beta 3 years ago
dutch.txt Merge branch 'master' into jgrpp-beta 3 years ago
english.txt Merge branch 'master' into jgrpp-beta 3 years ago
english_AU.txt Merge branch 'master' into jgrpp-beta 3 years ago
english_US.txt Merge branch 'master' into jgrpp-beta 3 years ago
esperanto.txt Merge branch 'master' into jgrpp-beta 3 years ago
estonian.txt Merge branch 'master' into jgrpp-beta 3 years ago
faroese.txt Merge branch 'master' into jgrpp-beta 3 years ago
finnish.txt Merge branch 'master' into jgrpp-beta 3 years ago
french.txt Merge branch 'master' into jgrpp-beta 3 years ago
frisian.txt Merge branch 'master' into jgrpp-beta 3 years ago
gaelic.txt Merge branch 'master' into jgrpp-beta 3 years ago
galician.txt Merge branch 'master' into jgrpp-beta 3 years ago
german.txt Merge branch 'master' into jgrpp-beta 3 years ago
greek.txt Merge branch 'master' into jgrpp-beta 3 years ago
hebrew.txt Merge branch 'master' into jgrpp-beta 3 years ago
hindi.txt Update: Translations from eints 3 years ago
hungarian.txt Merge branch 'master' into jgrpp-beta 3 years ago
icelandic.txt Merge branch 'master' into jgrpp-beta 3 years ago
ido.txt Merge branch 'master' into jgrpp-beta 3 years ago
indonesian.txt Merge branch 'master' into jgrpp-beta 3 years ago
irish.txt Merge branch 'master' into jgrpp-beta 3 years ago
italian.txt Merge branch 'master' into jgrpp-beta 3 years ago
japanese.txt Merge branch 'master' into jgrpp-beta 3 years ago
korean.txt Merge branch 'master' into jgrpp-beta 3 years ago
latin.txt Merge branch 'master' into jgrpp-beta 3 years ago
latvian.txt Merge branch 'master' into jgrpp-beta 3 years ago
lithuanian.txt Merge branch 'master' into jgrpp-beta 3 years ago
luxembourgish.txt Merge branch 'master' into jgrpp-beta 3 years ago
macedonian.txt Merge branch 'master' into jgrpp-beta 3 years ago
malay.txt Merge branch 'master' into jgrpp-beta 3 years ago
maltese.txt Merge branch 'master' into jgrpp-beta 3 years ago
marathi.txt Merge branch 'master' into jgrpp-beta 3 years ago
norwegian_bokmal.txt Merge branch 'master' into jgrpp-beta 3 years ago
norwegian_nynorsk.txt Merge branch 'master' into jgrpp-beta 3 years ago
persian.txt Merge branch 'master' into jgrpp-beta 3 years ago
polish.txt Merge branch 'master' into jgrpp-beta 3 years ago
portuguese.txt Merge branch 'master' into jgrpp-beta 3 years ago
romanian.txt Merge branch 'master' into jgrpp-beta 3 years ago
russian.txt Merge branch 'master' into jgrpp-beta 3 years ago
serbian.txt Merge branch 'master' into jgrpp-beta 3 years ago
simplified_chinese.txt Merge branch 'master' into jgrpp-beta 3 years ago
slovak.txt Merge branch 'master' into jgrpp-beta 3 years ago
slovenian.txt Merge branch 'master' into jgrpp-beta 3 years ago
spanish.txt Merge branch 'master' into jgrpp-beta 3 years ago
spanish_MX.txt Merge branch 'master' into jgrpp-beta 3 years ago
swedish.txt Merge branch 'master' into jgrpp-beta 3 years ago
tamil.txt Merge branch 'master' into jgrpp-beta 3 years ago
thai.txt Merge branch 'master' into jgrpp-beta 3 years ago
traditional_chinese.txt Merge branch 'master' into jgrpp-beta 3 years ago
turkish.txt Merge branch 'master' into jgrpp-beta 3 years ago
ukrainian.txt Merge branch 'master' into jgrpp-beta 3 years ago
urdu.txt Merge branch 'master' into jgrpp-beta 3 years ago
vietnamese.txt Merge branch 'master' into jgrpp-beta 3 years ago
welsh.txt Merge branch 'master' into jgrpp-beta 3 years ago