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 fdd666f66a Merge tag '14.0-beta1' into jgrpp
# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.cpp
4 months ago
..
extra Merge tag '14.0-beta1' into jgrpp 4 months ago
CMakeLists.txt strgen: Split non-upstream translated strings into separate file 1 year ago
afrikaans.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
arabic_egypt.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
basque.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
belarusian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
brazilian_portuguese.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
bulgarian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
catalan.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
chuvash.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
croatian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
czech.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
danish.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
dutch.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
english.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
english_AU.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
english_US.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
esperanto.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
estonian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
faroese.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
finnish.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
french.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
frisian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
gaelic.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
galician.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
german.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
greek.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
hebrew.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
hindi.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
hungarian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
icelandic.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
ido.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
indonesian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
irish.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
italian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
japanese.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
korean.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
latin.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
latvian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
lithuanian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
luxembourgish.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
macedonian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
malay.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
maltese.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
marathi.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
norwegian_bokmal.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
norwegian_nynorsk.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
persian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
polish.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
portuguese.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
romanian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
russian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
serbian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
simplified_chinese.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
slovak.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
slovenian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
spanish.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
spanish_MX.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
swedish.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
tamil.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
thai.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
traditional_chinese.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
turkish.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
ukrainian.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
urdu.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
vietnamese.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago
welsh.txt Add string codes for upstream wallclock mode, add upstream language changes 4 months ago