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
|
4 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
|
4 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 |
glx
|
9fc6329066
|
Cleanup: Remove unused strings
|
5 years ago |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
ca3c72438e
|
Merge branch 'master' into jgrpp
# Conflicts:
# Makefile.bundle.in
# src/os/macosx/string_osx.cpp
# src/station_cmd.cpp
|
5 years ago |
|
translators
|
58122983fb
|
Update: Translations from eints
korean: 6 changes by telk5093
|
5 years ago |
|
translators
|
1a13e03c49
|
Update: Translations from eints
korean: 2 changes by telk5093
|
5 years ago |
|
TELK
|
6eef6ac8d5
|
ko-KR: Update translation for 0.32.0
|
5 years ago |
|
Jonathan G Rennison
|
1f535915d1
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# config.lib
# src/core/bitmath_func.hpp
# src/lang/korean.txt
# src/main_gui.cpp
# src/order_gui.cpp
# src/script/api/script_object.cpp
# src/station_cmd.cpp
# src/video/cocoa/wnd_quartz.mm
|
5 years ago |
|
translators
|
f81cb0a90d
|
Update: Translations from eints
korean: 1 change by telk5093
|
5 years ago |
|
translators
|
b30994168d
|
Update: Translations from eints
korean: 34 changes by telk5093
|
5 years ago |
|
Jonathan G Rennison
|
d3e0c3787f
|
Merge branch 'master' into jgrpp-nrt
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
|
5 years ago |
|
Jonathan G Rennison
|
dbc5f1baed
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.cpp
|
5 years ago |
|
Jonathan G Rennison
|
ba8ed880c1
|
Merge branch 'master' into jgrpp-nrt
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
|
5 years ago |
|
Jonathan G Rennison
|
36eb4165b8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
|
5 years ago |
|
Jonathan G Rennison
|
91c5dee66c
|
Re-add removed group collapse/expand all buttons
|
5 years ago |
|
translators
|
2e23c5ec15
|
Update: Translations from eints
korean: 1 change by telk5093
|
5 years ago |
|
translators
|
00000ef8fa
|
Update: Translations from eints
korean: 3 changes by telk5093
|
5 years ago |
|
Jonathan G Rennison
|
98cfcebfcd
|
Merge pull request #91 into jgrpp
|
5 years ago |
|
TELK
|
9efa181b58
|
ko-KR: for 0.31.1
|
5 years ago |
|
translators
|
24493548da
|
Update: Translations from eints
french: 7 changes by glx
korean: 8 changes by telk5093
|
5 years ago |
|
translators
|
7a0e2923e5
|
Update: Translations from eints
norwegian (bokmal): 28 changes by Leifbk
russian: 17 changes by Lone_Wolf
korean: 14 changes by telk5093
|
5 years ago |
|
TELK
|
635b35996b
|
ko-KR: Remove remnants
|
5 years ago |
|
TELK
|
ddf5040f0d
|
ko-KR: Complete translation
|
5 years ago |