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 828d2146eb Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/ai/ai_info.cpp
#	src/company_base.h
#	src/economy.cpp
#	src/game/game_info.cpp
#	src/gfx_type.h
#	src/linkgraph/linkgraph_gui.cpp
#	src/palette.cpp
#	src/palette_func.h
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
#	src/window.cpp
#	src/window_func.h
3 months ago
..
extra Duplicate vehicle status bar velocity strings 3 months ago
CMakeLists.txt strgen: Split non-upstream translated strings into separate file 1 year ago
afrikaans.txt Merge branch 'master' into jgrpp 3 months ago
arabic_egypt.txt Merge branch 'master' into jgrpp 3 months ago
basque.txt Merge branch 'master' into jgrpp 3 months ago
belarusian.txt Merge branch 'master' into jgrpp 3 months ago
brazilian_portuguese.txt Merge branch 'master' into jgrpp 3 months ago
bulgarian.txt Merge branch 'master' into jgrpp 3 months ago
catalan.txt Merge branch 'master' into jgrpp 3 months ago
chuvash.txt Merge branch 'master' into jgrpp 3 months ago
croatian.txt Merge branch 'master' into jgrpp 3 months ago
czech.txt Merge branch 'master' into jgrpp 3 months ago
danish.txt Merge branch 'master' into jgrpp 3 months ago
dutch.txt Merge branch 'master' into jgrpp 3 months ago
english.txt Merge branch 'master' into jgrpp 3 months ago
english_AU.txt Merge branch 'master' into jgrpp 3 months ago
english_US.txt Merge branch 'master' into jgrpp 3 months ago
esperanto.txt Merge branch 'master' into jgrpp 3 months ago
estonian.txt Merge branch 'master' into jgrpp 3 months ago
faroese.txt Merge branch 'master' into jgrpp 3 months ago
finnish.txt Merge branch 'master' into jgrpp 3 months ago
french.txt Merge branch 'master' into jgrpp 3 months ago
frisian.txt Merge branch 'master' into jgrpp 3 months ago
gaelic.txt Merge branch 'master' into jgrpp 3 months ago
galician.txt Merge branch 'master' into jgrpp 3 months ago
german.txt Merge branch 'master' into jgrpp 3 months ago
greek.txt Merge branch 'master' into jgrpp 3 months ago
hebrew.txt Merge branch 'master' into jgrpp 3 months ago
hindi.txt Merge branch 'master' into jgrpp 3 months ago
hungarian.txt Merge branch 'master' into jgrpp 3 months ago
icelandic.txt Merge branch 'master' into jgrpp 3 months ago
ido.txt Merge branch 'master' into jgrpp 3 months ago
indonesian.txt Merge branch 'master' into jgrpp 3 months ago
irish.txt Merge branch 'master' into jgrpp 3 months ago
italian.txt Merge branch 'master' into jgrpp 3 months ago
japanese.txt Merge branch 'master' into jgrpp 3 months ago
korean.txt Merge branch 'master' into jgrpp 3 months ago
latin.txt Merge branch 'master' into jgrpp 3 months ago
latvian.txt Merge branch 'master' into jgrpp 3 months ago
lithuanian.txt Merge branch 'master' into jgrpp 3 months ago
luxembourgish.txt Merge branch 'master' into jgrpp 3 months ago
macedonian.txt Merge branch 'master' into jgrpp 3 months ago
malay.txt Merge branch 'master' into jgrpp 3 months ago
maltese.txt Merge branch 'master' into jgrpp 3 months ago
marathi.txt Merge branch 'master' into jgrpp 3 months ago
norwegian_bokmal.txt Merge branch 'master' into jgrpp 3 months ago
norwegian_nynorsk.txt Merge branch 'master' into jgrpp 3 months ago
persian.txt Merge branch 'master' into jgrpp 3 months ago
polish.txt Merge branch 'master' into jgrpp 3 months ago
portuguese.txt Merge branch 'master' into jgrpp 3 months ago
romanian.txt Merge branch 'master' into jgrpp 3 months ago
russian.txt Merge branch 'master' into jgrpp 3 months ago
serbian.txt Merge branch 'master' into jgrpp 3 months ago
simplified_chinese.txt Merge branch 'master' into jgrpp 3 months ago
slovak.txt Merge branch 'master' into jgrpp 3 months ago
slovenian.txt Merge branch 'master' into jgrpp 3 months ago
spanish.txt Merge branch 'master' into jgrpp 3 months ago
spanish_MX.txt Merge branch 'master' into jgrpp 3 months ago
swedish.txt Merge branch 'master' into jgrpp 3 months ago
tamil.txt Merge branch 'master' into jgrpp 3 months ago
thai.txt Merge branch 'master' into jgrpp 3 months ago
traditional_chinese.txt Merge branch 'master' into jgrpp 3 months ago
turkish.txt Merge branch 'master' into jgrpp 3 months ago
ukrainian.txt Merge branch 'master' into jgrpp 3 months ago
urdu.txt Merge branch 'master' into jgrpp 3 months ago
vietnamese.txt Merge branch 'master' into jgrpp 3 months ago
welsh.txt Merge branch 'master' into jgrpp 3 months ago