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 0d4d4a9cac Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/3rdparty/squirrel/squirrel/sqclosure.h
#	src/3rdparty/squirrel/squirrel/sqobject.h
#	src/3rdparty/squirrel/squirrel/sqvm.h
#	src/aircraft.h
#	src/airport_gui.cpp
#	src/blitter/32bpp_sse_func.hpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.h
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/date_gui.cpp
#	src/depot_gui.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/fios_gui.cpp
#	src/fontcache/spritefontcache.h
#	src/framerate_gui.cpp
#	src/game/game_text.cpp
#	src/gamelog.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/highscore_gui.cpp
#	src/hotkeys.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/main_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_gui.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_airport.cpp
#	src/newgrf_airport.h
#	src/newgrf_airporttiles.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_animation_base.h
#	src/newgrf_canal.cpp
#	src/newgrf_commons.h
#	src/newgrf_config.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_engine.h
#	src/newgrf_generic.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/newgrf_industries.cpp
#	src/newgrf_industries.h
#	src/newgrf_industrytiles.cpp
#	src/newgrf_industrytiles.h
#	src/newgrf_object.cpp
#	src/newgrf_object.h
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_roadtype.cpp
#	src/newgrf_roadtype.h
#	src/newgrf_spritegroup.cpp
#	src/newgrf_spritegroup.h
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/newgrf_town.cpp
#	src/newgrf_town.h
#	src/news_gui.cpp
#	src/object_gui.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32_main.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/npf/queue.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/roadveh.h
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/script/api/script_text.hpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_cmd.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spriteloader/grf.hpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/station_map.h
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/terraform_gui.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_window.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/water_cmd.cpp
#	src/waypoint_cmd.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/rail_widget.h
#	src/widgets/terraform_widget.h
#	src/window.cpp
#	src/window_gui.h
6 months ago
..
extra Merge branch 'master' into jgrpp 6 months ago
CMakeLists.txt strgen: Split non-upstream translated strings into separate file 1 year ago
afrikaans.txt Update: Translations from eints 9 months ago
arabic_egypt.txt Update: Translations from eints 9 months ago
basque.txt Update: Translations from eints 9 months ago
belarusian.txt Update: Translations from eints 9 months ago
brazilian_portuguese.txt Update: Translations from eints 8 months ago
bulgarian.txt Update: Translations from eints 9 months ago
catalan.txt Update: Translations from eints 8 months ago
chuvash.txt Update: Translations from eints 9 months ago
croatian.txt Update: Translations from eints 9 months ago
czech.txt Update: Translations from eints 9 months ago
danish.txt Update: Translations from eints 8 months ago
dutch.txt Update: Translations from eints 8 months ago
english.txt Fix: Allow NewGRF inspection of road tiles. (#11323) 8 months ago
english_AU.txt Update: Translations from eints 8 months ago
english_US.txt Update: Translations from eints 8 months ago
esperanto.txt Update: Translations from eints 9 months ago
estonian.txt Update: Translations from eints 9 months ago
faroese.txt Update: Translations from eints 9 months ago
finnish.txt Update: Translations from eints 8 months ago
french.txt Update: Translations from eints 8 months ago
frisian.txt Update: Translations from eints 9 months ago
gaelic.txt Update: Translations from eints 9 months ago
galician.txt Update: Translations from eints 9 months ago
german.txt Update: Translations from eints 9 months ago
greek.txt Update: Translations from eints 9 months ago
hebrew.txt Update: Translations from eints 9 months ago
hindi.txt Update: Translations from eints 9 months ago
hungarian.txt Update: Translations from eints 9 months ago
icelandic.txt Update: Translations from eints 9 months ago
ido.txt Update: Translations from eints 9 months ago
indonesian.txt Update: Translations from eints 9 months ago
irish.txt Update: Translations from eints 9 months ago
italian.txt Update: Translations from eints 8 months ago
japanese.txt Update: Translations from eints 9 months ago
korean.txt Merge branch 'master' into jgrpp 6 months ago
latin.txt Update: Translations from eints 9 months ago
latvian.txt Update: Translations from eints 9 months ago
lithuanian.txt Update: Translations from eints 9 months ago
luxembourgish.txt Update: Translations from eints 9 months ago
macedonian.txt Update: Translations from eints 9 months ago
malay.txt Update: Translations from eints 9 months ago
maltese.txt Update: Translations from eints 9 months ago
marathi.txt Update: Translations from eints 9 months ago
norwegian_bokmal.txt Update: Translations from eints 9 months ago
norwegian_nynorsk.txt Update: Translations from eints 9 months ago
persian.txt Update: Translations from eints 9 months ago
polish.txt Update: Translations from eints 8 months ago
portuguese.txt Update: Translations from eints 8 months ago
romanian.txt Update: Translations from eints 9 months ago
russian.txt Update: Translations from eints 8 months ago
serbian.txt Update: Translations from eints 9 months ago
simplified_chinese.txt Update: Translations from eints 8 months ago
slovak.txt Update: Translations from eints 9 months ago
slovenian.txt Update: Translations from eints 9 months ago
spanish.txt Update: Translations from eints 9 months ago
spanish_MX.txt Update: Translations from eints 9 months ago
swedish.txt Update: Translations from eints 9 months ago
tamil.txt Update: Translations from eints 9 months ago
thai.txt Update: Translations from eints 9 months ago
traditional_chinese.txt Update: Translations from eints 9 months ago
turkish.txt Update: Translations from eints 9 months ago
ukrainian.txt Update: Translations from eints 9 months ago
urdu.txt Update: Translations from eints 9 months ago
vietnamese.txt Update: Translations from eints 8 months ago
welsh.txt Update: Translations from eints 9 months ago