Commit Graph

1635 Commits (b7118b60fef80a9035958b565a8d9957620ca98b)

Author SHA1 Message Date
TELK 58f1ec6b5e Update: Translations of Korean - Make more natural conditional orders for cargo 4 years ago
Jonathan G Rennison 05dc785f13 Split STR_ORDER_CONDITIONAL_CARGO string into two, adjust format
See: #172
4 years ago
Jonathan G Rennison a79cab9b45 Merge branch 'pr-173' into jgrpp 4 years ago
TELK eb0328f258 ko-KR: Update translation up to 0.35.0 4 years ago
Jonathan G Rennison 7467051331 Merge branch 'master' into jgrpp
# Conflicts:
#	.gitignore
#	src/network/network_server.cpp
#	src/vehicle_gui.cpp
4 years ago
Yourself 087cae82fc Add: zero tree growth setting 4 years ago
TrevorShelton c39d62c245 Update: Disuse of STR_ERROR_INCOMPATIBLE_ROAD 4 years ago
TechGeekNZ cf8ea74733 Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake 4 years ago
translators 6d135d4b01 Update: Translations from eints
ukrainian: 1 change by nsergiy
korean: 1 change by telk5093
4 years ago
Jonathan G Rennison d37d08ebb3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_cmd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
4 years ago
translators 83cd040c61 Update: Translations from eints
latvian: 21 changes by Tranzistors
korean: 5 changes by telk5093
4 years ago
Jonathan G Rennison 07c9621fcf Merge branch 'master' into jgrpp 4 years ago
glx f0747c8c51 Update: Lang files 4 years ago
translators aa91c0666e Update: Translations from eints
korean: 1 change by telk5093
4 years ago
Jonathan G Rennison ad72fad68e Fix #148: Rename STR_MONEY_CHEAT_MULTIPLAYER* strings 4 years ago
TELK 951b687f5e ko-KR: Fix typo 4 years ago
TELK e236d938a9 ko-KR: Update translations 4 years ago
Jonathan G Rennison d210bc4d14 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp

Recalculate docking tile cache due to 57553cd8
4 years ago
translators 4a079407e7 Update: Translations from eints
hungarian: 26 changes by Brumi
korean: 3 changes by telk5093
4 years ago
translators ce7374ec25 Update: Translations from eints
korean: 1 change by telk5093
4 years ago
Jonathan G Rennison 475a3651b2 Lang: Delete stray line 4 years ago
TELK f5ca33328c ko-KR: Fix #133 4 years ago
TELK 199f0ac3e8 ko-KR: Update for 0.33.2 4 years ago
Jonathan G Rennison b96e7f78fb Merge branch 'master' into jgrpp 4 years ago
translators 87909855c8 Update: Translations from eints
italian: 2 changes by AlphaJack
korean: 8 changes by telk5093
4 years ago
Jonathan G Rennison babe98cdb1 Merge branch 'master' into jgrpp
# Conflicts:
#	src/network/network_server.h
#	src/pathfinder/yapf/yapf_road.cpp
#	src/viewport.cpp
4 years ago
translators 58c8ff456e Update: Translations from eints
korean: 2 changes by telk5093
4 years ago
translators be9ca4689e Update: Translations from eints
korean: 4 changes by telk5093
4 years ago
Jonathan G Rennison 81a1094cc8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/date.cpp
#	src/economy.cpp
#	src/misc.cpp
#	src/newgrf_house.cpp
4 years ago
Jonathan G Rennison dd99fd646d Merge branch 'master' into jgrpp
# Conflicts:
#	src/base_station_base.h
#	src/industry.h
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/station_cmd.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
5 years ago
translators b144258bf0 Update: Translations from eints
finnish: 19 changes by ln
dutch: 17 changes by JanWillem
danish: 109 changes by nielsmh
spanish (mexican): 1 change by Absay
korean: 1 change by telk5093
5 years ago
Jonathan G Rennison 278ddc1f58 Fix missing string code from vehicle list mass action button setting text 5 years ago
Jonathan G Rennison 4adfe0c9ae Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/town.h
#	src/town_gui.cpp
5 years ago
translators 5a31efd98d Update: Translations from eints
finnish: 1 change by hpiirai
5 years ago
Niels Martin Hansen 7413d65c2a Cleanup: Unused music GUI strings 5 years ago
translators 1812b0cf49 Update: Translations from eints
finnish: 4 changes by hpiirai
english (us): 20 changes by Supercheese
french: 7 changes by glx
korean: 7 changes by telk5093
5 years ago
Jonathan G Rennison 7960db35f2 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
5 years ago
translators 7be9c28037 Update: Translations from eints
korean: 2 changes by telk5093
5 years ago
translators 3a557b0336 Update: Translations from eints
finnish: 11 changes by hpiirai
korean: 6 changes by telk5093
5 years ago
pnda e558aa8ff4 Feature: Screenshot window 5 years ago
translators f6ce5c4563 Update: Translations from eints
french: 4 changes by arikover
korean: 5 changes by telk5093
5 years ago
translators dbe44e80f1 Update: Translations from eints 5 years ago
translators b0d443d525 Update: Translations from eints
korean: 1 change by telk5093
5 years ago
TELK 493a97ea3a ko-KR: Updates for 0.32.4 5 years ago
Jonathan G Rennison 030e8bf762 Rename programmable signals to programmable pre-signals
This is to make it less unclear what they actually are and do
5 years ago
Jonathan G Rennison b8ab9debed Merge branch 'master' into jgrpp 5 years ago
TELK afd0fa093f ko-KR: Apply commit 2b0c1a5 5 years ago
Jonathan G Rennison 2b0c1a5930 Separate allow stations under bridges into settings for: rail, road, docks 5 years ago
translators d242b1824c Update: Translations from eints
vietnamese: 19 changes by myquartz
russian: 5 changes by Lone_Wolf
korean: 5 changes by telk5093, 1 change by kevinhigh
5 years ago
Jonathan G Rennison ab3a373c73 Merge branch 'master' into jgrpp 5 years ago