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/unfinished
Jonathan G Rennison e95216b59d Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
3 years ago
..
chuvash.txt Update: Translations from eints 3 years ago
frisian.txt Merge branch 'master' into jgrpp 3 years ago
ido.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
macedonian.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
maltese.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
marathi.txt Merge tag '1.11.0-beta1' into jgrpp 3 years ago
persian.txt Merge branch 'master' into jgrpp 3 years ago
urdu.txt Merge branch 'master' into jgrpp 3 years ago