Commit Graph

1973 Commits

Author SHA1 Message Date
Jonathan G Rennison
f39b6f4ba3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/genworld_gui.cpp
#	src/landscape.cpp
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/screenshot.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings.ini
#	src/tile_type.h
#	src/widgets/genworld_widget.h
2021-04-10 18:29:36 +01:00
translators
5a14bf3a6c Update: Translations from eints
korean: 1 change by telk5093
spanish: 1 change by MontyMontana
2021-04-10 15:24:45 +00:00
translators
e98aed8b48 Update: Translations from eints
swedish: 3 changes by DonaldDuck313
korean: 2 changes by telk5093
portuguese (brazilian): 4 changes by brunodelara-cloudcrm
2021-04-09 17:46:40 +00:00
translators
2b86d42ddc Update: Translations from eints
english (us): 3 changes by 2TallTyler
korean: 3 changes by telk5093
russian: 32 changes by Ln-Wolf
spanish: 1 change by JohnBoyFan
french: 4 changes by arikover
portuguese: 10 changes by azulcosta
2021-04-08 17:53:09 +00:00
translators
2f5035d6dc Update: Translations from eints
korean: 1 change by telk5093
2021-04-06 17:53:34 +00:00
Jonathan G Rennison
2e6dbfee05 Merge branch 'master' into jgrpp 2021-04-05 19:31:34 +01:00
Jonathan G Rennison
5e14b54a0c Merge branch 'master' into jgrpp 2021-04-05 17:51:45 +01:00
translators
ec0c159586 Update: Translations from eints
korean: 1 change by telk5093
indonesian: 25 changes by dimaspaf14
romanian: 23 changes by kneekoo
2021-04-02 17:53:17 +00:00
TELK
827eb976f1 Update: Korean translation for v0.40.5 2021-03-29 14:15:08 +09:00
translators
a1230b932c Update: Translations from eints
swedish: 30 changes by kustridaren
spanish (mexican): 1 change by absay
japanese: 13 changes by Azusa257
vietnamese: 1 change by KhoiCanDev
estonian: 12 changes by siimsoni
czech: 6 changes by PatrikSamuelTauchim, 2 changes by tomas-vl
chinese (simplified): 88 changes by clzls
arabic (egypt): 16 changes by AviationGamerX
luxembourgish: 4 changes by phreeze83
korean: 34 changes by telk5093
italian: 16 changes by AlphaJack
german: 1 change by danidoedel, 1 change by Wuzzy2
slovak: 30 changes by FuryPapaya
catalan: 35 changes by J0anJosep
tamil: 16 changes by Aswn
dutch: 32 changes by Afoklala
portuguese (brazilian): 14 changes by Greavez, 5 changes by jpsl00
2021-03-28 17:53:11 +00:00
translators
76e92f6751 Update: Translations from eints 2021-03-26 18:46:58 +00:00
translators
ae65ceb1a7 Update: Translations from eints
chinese (simplified): 2 changes by clzls
korean: 2 changes by telk5093
slovak: 9 changes by FuryPapaya
catalan: 4 changes by J0anJosep
polish: 4 changes by pAter-exe
2021-03-22 18:07:50 +00:00
translators
5c73f93361 Update: Translations from eints
english (us): 8 changes by 2TallTyler
estonian: 16 changes by siimsoni
korean: 5 changes by telk5093
italian: 32 changes by AlphaJack
german: 5 changes by Wuzzy2
danish: 15 changes by achton
lithuanian: 89 changes by devbotas
spanish: 3 changes by MontyMontana
french: 8 changes by arikover
portuguese (brazilian): 3 changes by Greavez
polish: 17 changes by yazalo, 2 changes by pAter-exe
2021-03-15 18:07:52 +00:00
translators
217071aa1d Update: Translations from eints
norwegian (bokmal): 5 changes by Anolitt
estonian: 13 changes by siimsoni
korean: 5 changes by telk5093
italian: 1 change by AlphaJack
german: 5 changes by danidoedel
ukrainian: 15 changes by StepanIvasyn
catalan: 5 changes by J0anJosep
dutch: 5 changes by Afoklala
lithuanian: 82 changes by devbotas
spanish: 255 changes by MontyMontana
portuguese (brazilian): 5 changes by Greavez
2021-03-14 19:01:42 +00:00
translators
1fb1e75038 Update: Translations from eints
norwegian (bokmal): 26 changes by Anolitt
spanish (mexican): 25 changes by absay
japanese: 11 changes by Azusa257
korean: 7 changes by telk5093
german: 7 changes by danidoedel
russian: 63 changes by Ln-Wolf
finnish: 7 changes by hpiirai
ukrainian: 5 changes by StepanIvasyn
catalan: 7 changes by J0anJosep
spanish: 7 changes by MontyMontana
portuguese (brazilian): 12 changes by Greavez
2021-03-10 18:08:46 +00:00
translators
65f558d6df Update: Translations from eints
english (us): 18 changes by 2TallTyler
korean: 17 changes by telk5093
german: 13 changes by danidoedel, 4 changes by Wuzzy2
finnish: 17 changes by hpiirai
catalan: 17 changes by J0anJosep
lithuanian: 33 changes by devbotas
spanish: 17 changes by MontyMontana
portuguese (brazilian): 20 changes by Greavez
polish: 9 changes by yazalo
2021-03-09 18:22:28 +00:00
translators
ee69a0dc29 Update: Translations from eints
lithuanian: 5 changes by devbotas
portuguese (brazilian): 8 changes by Greavez
2021-03-08 19:03:59 +00:00
TELK
267d6d2891 Update: Korean translation for v0.40.4 2021-03-08 13:28:42 +09:00
Jonathan G Rennison
d6e2b32132 Merge branch 'master' into jgrpp
# Conflicts:
#	src/screenshot.h
2021-03-06 01:36:41 +00:00
translators
879eb9c348 Update: Translations from eints
estonian: 22 changes by siimsoni
korean: 1 change by telk5093
serbian: 41 changes by nkrs
german: 1 change by Wuzzy2
romanian: 14 changes by ALEX11BR
russian: 5 changes by Ln-Wolf
finnish: 5 changes by hpiirai
ukrainian: 2 changes by StepanIvasyn
lithuanian: 105 changes by devbotas
spanish: 3 changes by MontyMontana
french: 5 changes by MalaGaM
portuguese (brazilian): 13 changes by Greavez
2021-03-04 19:00:02 +00:00
TELK
6f4d45f61f Update: Korean - GUI setting for shading trees on slopes 2021-03-03 19:19:37 +09:00
TELK
3b135935c7 Change: Improve Korean translation 2021-03-03 19:19:37 +09:00
Jonathan G Rennison
84a7ab180e Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/lang/greek.txt
#	src/table/settings.ini
2021-03-02 13:46:42 +00:00
Jonathan G Rennison
f4e29071be Merge tag '1.11.0-beta2' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	src/blitter/32bpp_optimized.cpp
#	src/debug.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/lang/czech.txt
#	src/lang/english.txt
#	src/lang/italian.txt
#	src/lang/swedish.txt
#	src/lang/ukrainian.txt
#	src/network/network_server.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/follow_track.hpp
#	src/screenshot.cpp
#	src/settings_type.h
#	src/spritecache.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/video_driver.cpp
#	src/video/video_driver.hpp
#	src/video/win32_v.cpp
2021-03-02 11:59:03 +00:00
translators
02e7bc7e0a Update: Translations from eints
swedish: 4 changes by kustridaren
norwegian (bokmal): 3 changes by buzzCraft
spanish (mexican): 12 changes by absay
korean: 4 changes by telk5093
greek: 85 changes by sntovas
german: 4 changes by MagnumSociety
catalan: 5 changes by J0anJosep
tamil: 16 changes by Ramesh78dev
dutch: 4 changes by rcpaul
polish: 5 changes by pAter-exe
2021-03-01 19:01:41 +00:00
Tyler Trahan
8476f12432
Change: Improve graph period markings (#8732) 2021-02-24 09:18:15 +01:00
Jonathan G Rennison
dfecdf3afb Merge branch 'master' into jgrpp
# Conflicts:
#	src/dock_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/terraform_gui.cpp
#	src/vehicle.cpp
#	src/video/allegro_v.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/dedicated_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
2021-02-21 11:54:24 +00:00
translators
61275df7da Update: Translations from eints
estonian: 62 changes by siimsoni
korean: 1 change by telk5093
russian: 2 changes by Ln-Wolf
finnish: 2 changes by hpiirai
2021-02-20 19:00:44 +00:00
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
2021-02-19 15:38:34 +00:00
TELK
7e3ca2163d Update: Korean translation for v0.40.2 2021-02-17 16:11:24 +09:00
Yourself
310bb876a2 Add: new town council "indifferent" attitude
Closes: #184
2021-02-16 22:49:18 +00:00
translators
c9bcc12265 Update: Translations from eints
korean: 2 changes by telk5093
indonesian: 11 changes by dimaspaf14
russian: 2 changes by Ln-Wolf
finnish: 3 changes by hpiirai
french: 4 changes by glx22
2021-02-16 19:01:08 +00:00
translators
db246b82ac Update: Translations from eints
korean: 2 changes by telk5093
german: 56 changes by Wuzzy2
finnish: 2 changes by hpiirai
catalan: 2 changes by J0anJosep
polish: 9 changes by yazalo
2021-02-15 19:01:52 +00:00
translators
64e2d6b672 Update: Translations from eints
korean: 7 changes by telk5093
russian: 11 changes by Ln-Wolf
finnish: 7 changes by hpiirai
2021-02-11 19:01:10 +00:00
Jonathan G Rennison
650d5e014e Merge branch 'master' into jgrpp
# Conflicts:
#	src/ai/ai_gui.cpp
#	src/company_cmd.cpp
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/hungarian.txt
#	src/lang/korean.txt
#	src/lang/slovak.txt
#	src/main_gui.cpp
#	src/video/sdl2_v.cpp
2021-02-01 19:34:30 +00:00
Jonathan G Rennison
7154f8859d Merge tag '1.11.0-beta1' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp
2021-02-01 18:58:36 +00:00
Jonathan G Rennison
b7ddd486cf Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
2021-02-01 17:07:34 +00:00
Jonathan G Rennison
f9956d88c3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
2021-01-31 01:11:12 +00:00
Jonathan G Rennison
6c3e5642f8 Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
2021-01-31 01:08:35 +00:00
Jonathan G Rennison
39df1c49a1 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fileio.cpp
#	src/group_gui.cpp
#	src/industry.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.cpp
#	src/linkgraph/linkgraphschedule.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/town_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
2021-01-30 18:27:35 +00:00
Jonathan G Rennison
dddcd6d441 Merge branch 'pr-213' into jgrpp 2021-01-29 18:18:39 +00:00
translators
48698403a8 Update: Translations from eints
estonian: 85 changes by siimsoni
korean: 30 changes by telk5093
portuguese: 24 changes by CheapWebdesign
2021-01-29 18:17:44 +00:00
Jonathan G Rennison
09dc33022c Add client setting for vehicle naming scheme 2021-01-29 18:16:42 +00:00
TELK
cd1fd5f352 Update: Korean translation for ed0ffb6 2021-01-29 14:59:30 +09:00
translators
711723d738 Update: Translations from eints
norwegian (bokmal): 10 changes by buzzCraft
spanish (mexican): 7 changes by absay
korean: 1 change by telk5093
indonesian: 30 changes by dimaspaf14
finnish: 1 change by hpiirai
catalan: 2 changes by gerardnll
portuguese (brazilian): 4 changes by AKANexus
polish: 1 change by yazalo
2021-01-14 18:44:37 +00:00
translators
b99eafbfb0 Update: Translations from eints
korean: 14 changes by telk5093
finnish: 1 change by hpiirai
spanish: 41 changes by MontyMontana
polish: 5 changes by yazalo
2021-01-13 18:48:46 +00:00
translators
3e7c757398 Update: Translations from eints
spanish (mexican): 1 change by absay
2021-01-11 21:23:47 +00:00
translators
63288f80f3 Update: Translations from eints
korean: 1 change by telk5093
finnish: 1 change by hpiirai
polish: 5 changes by yazalo
2021-01-10 18:31:52 +00:00
translators
928276a66e Update: Translations from eints
korean: 4 changes by telk5093
finnish: 4 changes by hpiirai
catalan: 11 changes by J0anJosep
2021-01-09 18:30:51 +00:00
translators
0f1d338dda Update: Translations from eints
korean: 2 changes by telk5093
finnish: 2 changes by hpiirai
dutch: 49 changes by Afoklala
spanish: 16 changes by Luis45ccs
french: 7 changes by dimensi0n
polish: 2 changes by yazalo
2021-01-08 18:26:47 +00:00
translators
51e22515a8 Update: Translations from eints
spanish (mexican): 5 changes by absay
korean: 5 changes by telk5093
finnish: 5 changes by hpiirai
latvian: 14 changes by lexuslatvia
spanish: 23 changes by SeveralCircles, 10 changes by Luis45ccs
polish: 5 changes by yazalo
2021-01-07 18:28:27 +00:00
translators
c3faec4e9a Update: Translations from eints
polish: 7 changes by yazalo
2021-01-06 18:27:36 +00:00
TELK
5695ca782d Update: Korean translation for v0.39.2 2020-12-31 01:41:07 +09:00
translators
80a7d0365b Update: Translations from eints
korean: 4 changes by telk5093
german: 84 changes by UnsuspiciousGooball
finnish: 4 changes by hpiirai
slovak: 7 changes by FuryPapaya
2020-12-29 18:26:06 +00:00
translators
b30c3f6498 Update: Translations from eints
korean: 6 changes by telk5093
finnish: 6 changes by hpiirai
slovak: 47 changes by FuryPapaya
2020-12-28 18:21:37 +00:00
translators
e19b3adef3 Update: Translations from eints
korean: 29 changes by telk5093
finnish: 8 changes by hpiirai
slovak: 6 changes by FuryPapaya
french: 6 changes by glx22

(cherry picked from commit 1a67954ff9)
2020-12-27 21:07:41 +00:00
translators
316cccf301 Update: Translations from eints
french: 1 change by glx22

(cherry picked from commit 8c42f3a8d4)
2020-12-27 21:07:41 +00:00
Jonathan G Rennison
483ed2f468 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/openttd.cpp
2020-12-27 20:16:16 +00:00
translators
1bb0e6ed8c Update: Translations from eints
russian: 19 changes by lexuslatvia
finnish: 1 change by hpiirai
latvian: 19 changes by lexuslatvia
2020-12-27 18:18:16 +00:00
translators
2c8c6d423c Update: Translations from eints
korean: 18 changes by telk5093
2020-12-26 18:16:26 +00:00
translators
7b515fa0e2 Update: Translations from eints 2020-12-25 13:07:40 +00:00
frosch
ba49fa3b82 Codechange: Rename strings to match their usage. 2020-12-25 00:40:35 +01:00
translators
2e6f37ecf1 Update: Translations from eints
arabic (egypt): 15 changes by AviationGamerX
korean: 15 changes by telk5093
finnish: 12 changes by hpiirai
2020-12-23 18:17:50 +00:00
translators
cc8301449e Update: Translations from eints
korean: 2 changes by telk5093
catalan: 13 changes by perezdidac
2020-12-22 18:13:57 +00:00
Xaroth Brook
86e08aa8ef Update: Apply name changes to all languages. 2020-12-21 23:12:58 +01:00
translators
914fb4c987 Update: Translations from eints
korean: 1 change by telk5093
slovak: 6 changes by FuryPapaya
latvian: 9 changes by lexuslatvia
2020-12-20 19:04:18 +00:00
translators
1a67954ff9 Update: Translations from eints
korean: 29 changes by telk5093
finnish: 8 changes by hpiirai
slovak: 6 changes by FuryPapaya
french: 6 changes by glx22
2020-12-15 17:57:40 +00:00
translators
8c42f3a8d4 Update: Translations from eints
french: 1 change by glx22
2020-12-14 23:45:41 +00:00
translators
20151e41ea Update: Translations from eints
korean: 1 change by telk5093
french: 1 change by glx22
2020-12-09 17:50:24 +00:00
translators
819ce1bf49 Update: Translations from eints
slovak: 30 changes by FuryPapaya
lithuanian: 37 changes by devastatorius
2020-12-09 13:42:08 +00:00
TELK
9618b96cd7 Update: Korean translation for v0.39.1 2020-11-29 23:43:51 +09:00
Jonathan G Rennison
55fae045b1 Merge branch 'master' into jgrpp 2020-11-28 11:23:35 +00:00
TELK
8783858072 Update: Korean translation for v0.39.0 2020-11-10 15:41:46 +09:00
translators
918857e03b Update: Translations from eints
korean: 1 change by telk5093
slovak: 86 changes by FuryPapaya
2020-11-08 17:51:33 +00:00
Jonathan G Rennison
d50f3cd580 Show plans in GUI using plan colour, use prefix for private plans 2020-11-06 22:46:00 +00:00
TELK
058b16ffd6 Update: Korean translation for v0.38.1 2020-10-21 12:46:35 +09:00
TELK
7a977f16d7 Update: Korean translation 2020-10-08 17:57:08 +09:00
TELK
6cca615ac1 Update: [Korean] Change compare operation 2020-10-08 17:57:08 +09:00
translators
80f7937e42 Update: Translations from eints
korean: 8 changes by telk5093
2020-10-03 17:51:47 +00:00
translators
beaa7c7894 Update: Translations from eints
korean: 1 change by telk5093
2020-09-23 19:45:38 +02:00
Jonathan G Rennison
c55ca03066 Merge branch 'pr-192' into jgrpp 2020-09-23 10:20:09 +01:00
TELK
143495853c Update: Korean translation for v0.37.0, and some fixes 2020-09-23 18:14:45 +09:00
Jonathan G Rennison
c908a3afa8 Fix spelling error in tree growth speed setting: extremely slow 2020-09-11 22:28:09 +01:00
Jonathan G Rennison
e729875cfb Make programmable pre-signal GUI less garish 2020-08-31 23:05:11 +01:00
Jonathan G Rennison
5b78090a61 Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/saveload/town_sl.cpp
#	src/screenshot.h
#	src/script/api/ai/ai_date.hpp.sq
#	src/script/api/ai/ai_marine.hpp.sq
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_date.hpp.sq
#	src/script/api/game/game_marine.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/game/game_window.hpp.sq
#	src/script/api/script_window.hpp
#	src/script/api/template/template_window.hpp.sq
#	src/signal.cpp
#	src/statusbar_gui.cpp
#	src/toolbar_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
2020-08-27 18:31:09 +01:00
TELK
6e3376d6d3 Update: Korean translation update 2020-08-07 14:08:42 +09:00
TechGeekNZ
a10013dd00 Codechange: Spell 'Viewport' consistently
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
2020-07-27 17:31:29 +01:00
TELK
58f1ec6b5e Update: Translations of Korean - Make more natural conditional orders for cargo 2020-07-15 18:35:07 +09:00
Jonathan G Rennison
05dc785f13 Split STR_ORDER_CONDITIONAL_CARGO string into two, adjust format
See: #172
2020-07-12 21:58:49 +01:00
Jonathan G Rennison
a79cab9b45 Merge branch 'pr-173' into jgrpp 2020-07-12 21:17:46 +01:00
TELK
eb0328f258 ko-KR: Update translation up to 0.35.0 2020-07-13 03:31:06 +09:00
translators
954d0b4e5b Update: Translations from eints
korean: 1 change by telk5093
2020-07-12 19:45:40 +02:00
Jonathan G Rennison
7467051331 Merge branch 'master' into jgrpp
# Conflicts:
#	.gitignore
#	src/network/network_server.cpp
#	src/vehicle_gui.cpp
2020-07-12 12:29:28 +01:00
Yourself
087cae82fc Add: zero tree growth setting 2020-07-10 15:22:02 -07:00
TrevorShelton
c39d62c245 Update: Disuse of STR_ERROR_INCOMPATIBLE_ROAD 2020-07-10 14:47:55 +01:00
TechGeekNZ
cf8ea74733 Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake 2020-06-28 21:56:43 +01:00
translators
6d135d4b01 Update: Translations from eints
ukrainian: 1 change by nsergiy
korean: 1 change by telk5093
2020-06-22 19:45:40 +02:00
Jonathan G Rennison
d37d08ebb3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_cmd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
2020-05-14 00:40:16 +01:00
translators
83cd040c61 Update: Translations from eints
latvian: 21 changes by Tranzistors
korean: 5 changes by telk5093
2020-05-13 19:45:39 +02:00
Jonathan G Rennison
07c9621fcf Merge branch 'master' into jgrpp 2020-05-07 20:57:47 +01:00
glx
f0747c8c51 Update: Lang files 2020-05-06 09:54:36 +01:00
translators
aa91c0666e Update: Translations from eints
korean: 1 change by telk5093
2020-05-04 19:45:38 +02:00
Jonathan G Rennison
ad72fad68e Fix #148: Rename STR_MONEY_CHEAT_MULTIPLAYER* strings 2020-04-26 20:08:44 +01:00
TELK
951b687f5e ko-KR: Fix typo 2020-04-20 18:23:10 +09:00
TELK
e236d938a9 ko-KR: Update translations 2020-04-20 13:26:34 +09:00
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
2020-04-01 00:32:45 +01:00
translators
4a079407e7 Update: Translations from eints
hungarian: 26 changes by Brumi
korean: 3 changes by telk5093
2020-03-20 19:45:41 +01:00
translators
ce7374ec25 Update: Translations from eints
korean: 1 change by telk5093
2020-03-17 19:45:41 +01:00
Jonathan G Rennison
475a3651b2 Lang: Delete stray line 2020-02-28 01:44:55 +00:00
TELK
f5ca33328c ko-KR: Fix #133 2020-02-28 02:34:48 +09:00
TELK
199f0ac3e8 ko-KR: Update for 0.33.2 2020-02-28 02:34:48 +09:00
Jonathan G Rennison
b96e7f78fb Merge branch 'master' into jgrpp 2020-02-21 21:18:01 +00:00
translators
87909855c8 Update: Translations from eints
italian: 2 changes by AlphaJack
korean: 8 changes by telk5093
2020-02-15 19:45:40 +01:00
Jonathan G Rennison
babe98cdb1 Merge branch 'master' into jgrpp
# Conflicts:
#	src/network/network_server.h
#	src/pathfinder/yapf/yapf_road.cpp
#	src/viewport.cpp
2020-02-09 15:43:47 +00:00
translators
58c8ff456e Update: Translations from eints
korean: 2 changes by telk5093
2020-02-05 19:45:39 +01:00
translators
be9ca4689e Update: Translations from eints
korean: 4 changes by telk5093
2020-01-30 19:45:39 +01:00
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
2020-01-29 19:32:06 +00:00
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
2020-01-20 18:36:55 +00:00
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
2020-01-11 19:45:38 +01:00
Jonathan G Rennison
278ddc1f58 Fix missing string code from vehicle list mass action button setting text 2020-01-08 20:37:26 +00:00
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
2020-01-08 18:40:34 +00:00
translators
5a31efd98d Update: Translations from eints
finnish: 1 change by hpiirai
2020-01-07 19:45:39 +01:00
Niels Martin Hansen
7413d65c2a Cleanup: Unused music GUI strings 2020-01-07 18:13:58 +01:00
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
2020-01-06 19:45:41 +01:00
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
2020-01-06 18:45:51 +00:00
translators
7be9c28037 Update: Translations from eints
korean: 2 changes by telk5093
2020-01-04 19:45:39 +01:00
translators
3a557b0336 Update: Translations from eints
finnish: 11 changes by hpiirai
korean: 6 changes by telk5093
2020-01-01 19:45:41 +01:00
pnda
e558aa8ff4 Feature: Screenshot window 2020-01-01 10:19:12 +00:00
translators
f6ce5c4563 Update: Translations from eints
french: 4 changes by arikover
korean: 5 changes by telk5093
2019-12-30 19:45:44 +01:00
translators
dbe44e80f1 Update: Translations from eints 2019-12-23 19:45:40 +01:00
translators
b0d443d525 Update: Translations from eints
korean: 1 change by telk5093
2019-12-22 19:45:40 +01:00
TELK
493a97ea3a ko-KR: Updates for 0.32.4 2019-12-14 17:31:54 +09:00
Jonathan G Rennison
030e8bf762 Rename programmable signals to programmable pre-signals
This is to make it less unclear what they actually are and do
2019-12-05 18:13:35 +00:00
Jonathan G Rennison
b8ab9debed Merge branch 'master' into jgrpp 2019-11-20 21:21:55 +00:00
TELK
afd0fa093f ko-KR: Apply commit 2b0c1a5 2019-11-20 15:10:17 +09:00
Jonathan G Rennison
2b0c1a5930 Separate allow stations under bridges into settings for: rail, road, docks 2019-11-19 22:51:45 +00:00
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
2019-11-17 19:45:40 +01:00
Jonathan G Rennison
ab3a373c73 Merge branch 'master' into jgrpp 2019-11-16 19:54:31 +00:00
glx
9fc6329066 Cleanup: Remove unused strings 2019-11-13 08:11:37 +00:00
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
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
ca3c72438e Merge branch 'master' into jgrpp
# Conflicts:
#	Makefile.bundle.in
#	src/os/macosx/string_osx.cpp
#	src/station_cmd.cpp
2019-11-06 17:49:00 +00:00
translators
58122983fb Update: Translations from eints
korean: 6 changes by telk5093
2019-10-30 19:45:40 +01:00
translators
1a13e03c49 Update: Translations from eints
korean: 2 changes by telk5093
2019-10-29 19:45:38 +01:00
TELK
6eef6ac8d5 ko-KR: Update translation for 0.32.0 2019-10-12 22:10:53 +09:00
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
2019-09-18 01:18:28 +01:00
translators
f81cb0a90d Update: Translations from eints
korean: 1 change by telk5093
2019-09-11 19:45:38 +02:00
translators
b30994168d Update: Translations from eints
korean: 34 changes by telk5093
2019-09-10 19:45:38 +02:00
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
2019-07-13 20:34:52 +01:00
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
2019-07-11 20:03:23 +01:00
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
2019-07-11 19:45:56 +01:00
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
2019-07-08 16:19:07 +01:00
Jonathan G Rennison
91c5dee66c Re-add removed group collapse/expand all buttons 2019-07-03 18:16:25 +01:00
translators
2e23c5ec15 Update: Translations from eints
korean: 1 change by telk5093
2019-07-02 19:45:45 +02:00
translators
00000ef8fa Update: Translations from eints
korean: 3 changes by telk5093
2019-06-12 19:45:44 +02:00
Jonathan G Rennison
98cfcebfcd Merge pull request #91 into jgrpp 2019-06-05 23:46:27 +01:00
TELK
9efa181b58 ko-KR: for 0.31.1 2019-06-01 03:55:00 +09:00
translators
24493548da Update: Translations from eints
french: 7 changes by glx
korean: 8 changes by telk5093
2019-05-16 19:45:43 +02:00
translators
7a0e2923e5 Update: Translations from eints
norwegian (bokmal): 28 changes by Leifbk
russian: 17 changes by Lone_Wolf
korean: 14 changes by telk5093
2019-05-10 19:45:45 +02:00
TELK
635b35996b ko-KR: Remove remnants 2019-05-07 23:57:33 +09:00
TELK
ddf5040f0d ko-KR: Complete translation 2019-05-07 17:14:02 +09:00
peter1138
a1de834104 Cleanup: Remove unused string. 2019-05-04 22:39:29 +01:00
glx
515202da7b Fix 6f33cfd05: incorrect {G} usage in korean translation 2019-05-03 21:49:40 +02:00
translators
6f33cfd059 Update: Translations from eints
korean: 536 changes by telk5093
2019-05-03 19:45:46 +02:00
translators
3469a2a445 Update: Translations from eints
dutch: 27 changes by JanWillem
french: 29 changes by glx
hungarian: 3 changes by Brumi
korean: 71 changes by telk5093
2019-05-02 19:45:47 +02:00
peter1138
672c857e37 Cleanup: Update modified and removed strings in language files. 2019-05-01 21:36:27 +02:00
translators
aa220b2375 Update: Translations from eints
indonesian: 2 changes by fanioz
dutch: 3 changes by JanWillem
korean: 3 changes by telk5093
2019-04-28 19:45:44 +02:00
Jonathan G Rennison
6d3e9093c4 TBTR: Show warning on templates which include unavailable vehicles 2019-04-27 22:47:31 +01:00
Jonathan G Rennison
58433c7667 Merge branch 'master' into jgrpp
# Conflicts:
#	src/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
2019-03-30 20:45:58 +00:00
translators
1d14e31be3 Update: Translations from eints
korean: 14 changes by telk5093
2019-03-29 19:45:45 +01:00
translators
e817951bfd Update: Translations from eints
finnish: 2 changes by hpiirai
english (us): 17 changes by Supercheese
luxembourgish: 10 changes by Phreeze
dutch: 20 changes by JanWillem
norwegian (bokmal): 2 changes by Leifbk
latin: 16 changes by Supercheese
portuguese: 3 changes by JayCity
2019-03-27 19:45:44 +01:00
Jonathan G Rennison
ba34ec7ade Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
2019-03-27 18:12:04 +00:00
translators
37b9fdc0c1 Update: Translations from eints
finnish: 13 changes by hpiirai
korean: 1 change by telk5093
2019-03-24 19:45:44 +01:00
Patric Stout
72c5f2b3ee Remove: DOS support
In 10 years there was no active development on DOS. Although it
turned out to still work, the FPS was very bad. There is little
interest in the current community to look into this.

Further more, we like to switch to c++11 functions for threads,
which are not implemented by DJGPP, the only current compiler
for DOS.

Additionally, DOS is the only platform which does not support
networking. It is the reason we have tons of #ifdefs to support
disabling networking.

By removing DOS support, we can both use c++11 functions for threads,
and remove all the code related to disabling network. Sadly, this
means we have to see DOS go.

Of course, if you feel up for the task, simply revert this commit,
and implement stub c++11 functions for threads and stub functions
for networking. We are more than happy to accept such Pull Request.
2019-03-19 23:22:51 +01:00
translators
559d4e8335 Update: Translations from eints
korean: 7 changes by telk5093
2019-03-19 19:45:46 +01:00
Charles Pigott
592f591a4b Cleanup: Unused lang strings 2019-03-16 22:30:11 +00:00
peter1138
35967effd3 Cleanup: Update changed string in language files. 2019-03-15 17:43:10 +00:00
Jonathan G Rennison
80dc7d89ef Follow gui.population_in_label setting when showing rating in town label 2019-03-13 18:41:44 +00:00
Jonathan G Rennison
5e6d283463 Merge branch 'master' into jgrpp
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
2019-03-13 03:38:26 +00:00
Patric Stout
f58db44ff2 Remove: BeOS support (deprecated by Haiku)
In 10 years there is no commit to change how BeOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).

With the arrival of SDL2 (and removal of SDL), BeOS is no longer
support. SDL2 suggests to use Haiku instead of BeOS.
2019-03-05 22:03:00 +01:00
Patric Stout
7784d77713 Remove: MorphOS / AmigaOS support
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).

With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.

If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
2019-03-05 22:03:00 +01:00
translators
585957b226 Update: Translations from eints
finnish: 39 changes by hpiirai
french: 4 changes by glx
hungarian: 4 changes by Brumi
russian: 3 changes by Lone_Wolf
korean: 20 changes by telk5093
croatian: 5 changes by VoyagerOne
2019-03-04 19:45:42 +01:00
Jonathan G Rennison
60c2f0ebc8 Remove now unused town_bridge_over_rail setting, feature in trunk 2019-03-04 01:19:56 +00:00
Jonathan G Rennison
7ff252c58d Merge branch 'master' into jgrpp
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
2019-03-04 01:18:25 +00:00
translators
f240f61fb2 Update: Translations from eints
danish: 11 changes by nielsmh
spanish (mexican): 11 changes by Absay
hungarian: 100 changes by Brumi
russian: 6 changes by Lone_Wolf
croatian: 9 changes by VoyagerOne
2019-02-23 19:45:45 +01:00
Jonathan G Rennison
36ac643749 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/afrikaans.txt
#	src/lang/basque.txt
#	src/lang/belarusian.txt
#	src/lang/brazilian_portuguese.txt
#	src/lang/bulgarian.txt
#	src/lang/catalan.txt
#	src/lang/croatian.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/estonian.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/gaelic.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/lang/greek.txt
#	src/lang/hebrew.txt
#	src/lang/hungarian.txt
#	src/lang/icelandic.txt
#	src/lang/indonesian.txt
#	src/lang/irish.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latin.txt
#	src/lang/latvian.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/norwegian_nynorsk.txt
#	src/lang/polish.txt
#	src/lang/portuguese.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/slovenian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/thai.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/unfinished/persian.txt
#	src/lang/vietnamese.txt
#	src/lang/welsh.txt
#	src/rail_cmd.cpp
#	src/station_cmd.cpp
2019-02-19 19:36:30 +00:00
glx
ebe84b9d4c Cleanup: update modified and removed strings in languages 2019-02-16 22:19:16 +01:00
Jonathan G Rennison
2fdcc52321 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/lang/dutch.txt
#	src/lang/korean.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/rail.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle.cpp
2019-02-13 19:09:06 +00:00
translators
62d6cd75ba Update: Translations from eints
korean: 6 changes by telk5093
polish: 18 changes by xaxa
2019-02-07 19:45:43 +01:00
Jonathan G Rennison
2142452305 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/core/config.h
#	src/network/network.cpp
#	src/network/network_udp.cpp
#	src/rev.h
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
#	src/viewport.cpp
2019-02-04 18:32:44 +00:00
translators
bdf0dc67e9 Update: Translations from eints
croatian: 4 changes by VoyagerOne
korean: 4 changes by telk5093
russian: 2 changes by Lone_Wolf
german: 4 changes by smwforever45, 4 changes by ShadowCop
spanish (mexican): 2 changes by Absay
portuguese: 52 changes by vesgo
finnish: 3 changes by hpiirai
dutch: 238 changes by JanWillem
estonian: 1 change by rm87
2019-02-02 19:45:42 +01:00
Jonathan G Rennison
9d3b77c5a2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fios_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
2019-02-02 01:27:56 +00:00
Peter Nelson
fa53abe864 Doc: Yearly increment. 2019-02-01 22:12:07 +00:00
Jonathan G Rennison
281d346fe2 Merge branch 'master' into jgrpp
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
2019-01-29 02:28:14 +00:00
translators
9f458ecb10 Update: Translations from eints
korean: 15 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
russian: 21 changes by Lone_Wolf
spanish (mexican): 13 changes by Absay
2019-01-28 19:45:43 +01:00
translators
80c7965c65 Update: Translations from eints
belarusian: 1 change by translators
norwegian (nynorsk): 1 change by translators
chinese (simplified): 1 change by translators
serbian: 1 change by translators
czech: 1 change by translators
esperanto: 1 change by translators
chinese (traditional): 1 change by translators
portuguese (brazilian): 1 change by translators
norwegian (bokmal): 1 change by translators
swedish: 1 change by translators
lithuanian: 1 change by translators
hebrew: 1 change by translators
croatian: 1 change by translators
bulgarian: 1 change by translators
catalan: 1 change by translators
afrikaans: 1 change by translators
vietnamese: 1 change by translators
slovenian: 1 change by translators
faroese: 1 change by translators
thai: 1 change by translators
frisian: 1 change by translators
scottish gaelic: 1 change by translators
persian: 1 change by translators
korean: 1 change by translators
greek: 1 change by translators
latin: 1 change by translators
welsh: 1 change by translators
galician: 1 change by translators
japanese: 1 change by translators
english (au): 1 change by translators
italian: 6 changes by lorenzodv, 1 change by translators
urdu: 1 change by translators
french: 7 changes by glx
malay: 1 change by translators
tamil: 1 change by translators
spanish: 4 changes by SilverSurferZzZ, 1 change by translators
slovak: 1 change by translators
basque: 1 change by translators
polish: 1 change by translators
indonesian: 1 change by translators
arabic (egypt): 1 change by translators
russian: 2 changes by Lone_Wolf, 1 change by translators
hungarian: 1 change by translators
luxembourgish: 1 change by translators
romanian: 1 change by translators
irish: 1 change by translators
latvian: 1 change by translators
german: 1 change by translators
danish: 1 change by translators
spanish (mexican): 7 changes by Absay
icelandic: 1 change by translators
english (us): 1 change by translators
turkish: 1 change by translators
portuguese: 1 change by translators
ukrainian: 1 change by translators
finnish: 1 change by translators
dutch: 1 change by translators
estonian: 1 change by translators
2019-01-27 19:45:42 +01:00
Peter Nelson
b60b193a6d Cleanup: Remove out of date translations for changed string. 2019-01-27 12:34:49 +01:00
Jonathan G Rennison
fe42451b9d Fix {STRING}/{RAW_STRING} mismatches in language files 2019-01-22 18:42:28 +00:00
Jonathan G Rennison
191afd93c1 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/vehicle_base.h
#	src/widgets/dropdown.cpp
2019-01-21 19:28:29 +00:00
translators
60da05cf2a Update: Translations from eints
french: 3 changes by glx
2019-01-19 19:45:43 +01:00
Niels Martin Hansen
f37304f9f5 Cleanup: Remove unused strings 2019-01-19 13:33:17 +01:00
Jonathan G Rennison
e3d167f9f0 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
2019-01-14 00:01:44 +00:00
translators
e34a6c58ea Update: Translations from eints
italian: 1 change by lorenzodv
french: 29 changes by glx
2019-01-10 19:45:44 +01:00
kiwitreekor
d1b98855de
Fix typos 2019-01-06 22:43:13 +09:00
kiwitreekor
030d6a3024
Update Korean Translation 2019-01-06 18:55:17 +09:00
Jonathan G Rennison
7da1f8b592 Merge branch 'master' into jgrpp 2018-12-19 00:18:49 +00:00
translators
777cfe5611 Update: Translations from eints
chinese (simplified): 2 changes by ww9980
korean: 23 changes by kevinhigh
2018-12-12 19:45:44 +01:00
Jonathan G Rennison
b1190b32b0 Merge branch 'master' into jgrpp 2018-11-26 18:49:15 +00:00
translators
af4a21bd82 Update: Translations from eints
korean: 4 changes by telk5093
spanish: 3 changes by SilverSurferZzZ
russian: 8 changes by Lone_Wolf
2018-11-25 19:45:41 +01:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
2018-11-05 12:53:36 +00:00
Oskari Leppäaho
b3b89257f7 Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION" 2018-10-31 19:24:21 +01:00
Jonathan G Rennison
3a640af71d Merge branch 'master' into jgrpp
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
2018-10-29 18:33:15 +00:00
translators
9cf999bca7 Update: Translations from eints
korean: 2 changes by telk5093
2018-10-03 19:45:41 +02:00
Jonathan G Rennison
9038ac5c00 Merge branch 'master' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
2018-08-06 02:33:13 +01:00
translators
4bd281cef3 Update: Translations from eints
korean: 44 changes by telk5093
2018-07-30 19:45:41 +02:00
Jonathan G Rennison
035f5622b9 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
2018-07-24 18:30:42 +01:00
translators
6a6ffddc5f Update: Translations from eints
greek: 46 changes by kyrm
italian: 44 changes by lorenzodv
2018-07-20 19:45:40 +02:00
translators
93469a92f2 Update: Translations from eints
korean: 3 changes by kevinhigh
2018-07-18 19:45:40 +02:00
Jonathan G Rennison
4d1bd8e4b4 Merge branch 'master' into jgrpp
# Conflicts:
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/music.cpp
#	src/table/settings.ini
#	src/town_cmd.cpp
#	src/train_cmd.cpp
2018-06-25 18:57:48 +01:00
translators
21ac11548a Update: Translations from eints
korean: 1 change by telk5093
2018-06-22 19:45:39 +02:00
kiwitreekor
f00930fa52 Merge pull request #59 from kiwitreekor
Squashed commit of the following:

commit 0497399a03
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 22:10:27 2018 +0900

    Update korean.txt

commit c4d60bc9e9
Merge: 27729f1 0ac92b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 00:10:11 2018 +0900

    Merge branch 'jgrpp' into jgrpp

commit 27729f10fc
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 00:02:20 2018 +0900

    Update Korean Translation

commit 1e67b51ed8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:33:04 2018 +0900

    Add files via upload

commit 9ee0445edd
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:30:43 2018 +0900

    upload mistake

commit 21bc4d9db1
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:27:51 2018 +0900

    Fix Mistypo

commit 716b451d8b
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:25:15 2018 +0900

    Update Korean Translation
2018-06-21 20:56:56 +01:00
translators
7ae1e3e1e2 Update: Translations from eints
korean: 15 changes by telk5093
greek: 4 changes by Jubilee
2018-06-12 19:45:40 +02:00
Jonathan G Rennison
8e9d68048a Merge branch 'master' into jgrpp
# Conflicts:
#	src/string.cpp
2018-06-07 06:49:18 +01:00
PeterN
eaa32f5ad5
Change: Use name of cargo instead of Passengers/Mail in town statistics. (#6801)
* Change: Use name of cargo instead of Passengers/Mail in town statistics.
* Cleanup: Remove strings from all language files.
2018-06-04 13:14:11 +01:00
Jonathan G Rennison
ad1c402ad8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
2018-05-03 23:54:51 +01:00
Niels Martin Hansen
683b46a5b5 Cleanup: Remove unused strings from language files 2018-04-29 19:26:05 +02:00
PeterN
cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756) 2018-04-28 22:27:14 +01:00
Jonathan G Rennison
385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-03-11 22:21:39 +00:00
frosch
91464af737 (svn r27980) -Doc: Yearly increment 2018-03-11 12:24:32 +00:00
frosch
b1592787eb (svn r27980) -Doc: Yearly increment 2018-03-11 12:24:32 +00:00
Jonathan G Rennison
911ba8cb8b Merge branch 'master' into jgrpp 2018-02-09 18:10:57 +00:00
translators
dd567c6105 (svn r27968) -Update from Eints:
korean: 1 change by telk5093
2018-02-07 18:45:38 +00:00
translators
eec6167155 (svn r27968) -Update from Eints:
korean: 1 change by telk5093
2018-02-07 18:45:38 +00:00
Jonathan G Rennison
18f2a28715 Fix stray STRING2 in lang/korean.txt 2018-01-15 21:40:00 +00:00
Jonathan G Rennison
4a0d949d83 Merge branch 'master' into jgrpp 2018-01-14 23:22:47 +00:00
kiwitreekor
f0d9df359e Add files via upload 2018-01-14 23:20:15 +00:00
kiwitreekor
8d2a3b75d3 Update Korean Translation 2018-01-14 23:20:14 +00:00
Jonathan G Rennison
dda20d08c1 Merge branch 'improved_breakdowns' into jgrpp
Update German and Korean language strings

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
2018-01-04 19:47:46 +00:00
frosch
1bc6fdef31 (svn r27953) -Cleanup: Adjust other languages for r27952 2017-12-27 21:55:30 +00:00
frosch
b394dd8468 (svn r27953) -Cleanup: Adjust other languages for r27952 2017-12-27 21:55:30 +00:00
Jonathan G Rennison
6df5cac0df Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/vehicle.cpp
2017-09-04 01:24:10 +01:00
Jonathan G Rennison
f77a368268 Merge branch 'crashlog_improvements' into jgrpp 2017-09-04 01:23:08 +01:00
translators
6d08d054ef (svn r27911) -Update from Eints:
korean: 1 change by telk5093
hebrew: 4 changes by dnd_man
2017-09-02 17:45:39 +00:00
translators
6d1effd3c9 (svn r27911) -Update from Eints:
korean: 1 change by telk5093
hebrew: 4 changes by dnd_man
2017-09-02 17:45:39 +00:00
Jonathan G Rennison
9212188191 Merge pull request #27 from kiwitreekor into jgrpp 2017-08-29 20:59:57 +01:00
kiwitreekor
8b3137c9c7 Korean translation update 2017-08-26 12:08:54 +09:00
alberth
a3f30a30df (svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01) 2017-08-20 07:11:08 +00:00
alberth
2eae80bbfe (svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01) 2017-08-20 07:11:08 +00:00
Jonathan G Rennison
835c172edf Fix wrong type of whitespace in Korean translation 2017-08-11 19:42:52 +01:00
kiwitreekor
181988e1fd Add Korean Translations
Translated STR_CONFIG_SETTING_TOWN_ROAD_OVER_RAIL / STR_CONFIG_SETTING_TOWN_ROAD_OVER_RAIL_HELPTEXT
2017-08-02 13:17:01 +09:00
kiwitreekor
c2148890c9 Merge and squash pull request #21
Fix whitespace issues
2017-08-01 18:41:31 +01:00
kiwitreekor
0c09bf7d68 Korean Translation 2017-07-03 20:23:00 +09:00
kiwitreekor
e057d37e28 Add Korean translations 2017-07-03 20:15:15 +09:00
Jonathan G Rennison
21696cc126 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/lang/german.txt
2017-06-06 21:06:47 +01:00
Jonathan G Rennison
10a91b291e Fix string references in pull request #18 2017-05-16 20:54:42 +01:00
TELK
f81cdf0312 Erase original text 2017-05-14 14:12:25 +09:00
TELK
d3dc1c0945 ko-KR: Update Korean translation
Not fluently translated and seems that 7 strings are missed
2017-05-12 03:27:47 +09:00
translators
092ede70fd (svn r27871) -Update from Eints:
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
2017-05-11 17:45:37 +00:00
translators
43a917420b (svn r27871) -Update from Eints:
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
2017-05-11 17:45:37 +00:00
Jonathan G Rennison
d1a287d73c Merge branch 'save_ext' into jgrpp 2017-04-11 18:42:11 +01:00
translators
830a4b63c9 (svn r27850) -Update from Eints:
korean: 3 changes by telk5093
spanish (mexican): 18 changes by Absay
2017-04-09 17:45:38 +00:00
translators
144604a29e (svn r27850) -Update from Eints:
korean: 3 changes by telk5093
spanish (mexican): 18 changes by Absay
2017-04-09 17:45:38 +00:00
translators
c44b3db7a3 (svn r27849) -Update from Eints:
korean: 4 changes by telk5093
2017-04-08 17:45:39 +00:00
translators
be21185988 (svn r27849) -Update from Eints:
korean: 4 changes by telk5093
2017-04-08 17:45:39 +00:00
TELK
f2cd869a56 Merge & squash pull request #16
Korean: Add Chunnel translations and etc.
2017-04-07 20:25:42 +01:00
Jonathan G Rennison
ca93c90b56 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
2017-04-07 18:31:06 +01:00
translators
3b6fa4e33f (svn r27848) -Update from Eints:
korean: 43 changes by telk5093
spanish: 6 changes by SilverSurferZzZ
2017-04-06 17:45:37 +00:00
translators
1644ef5f2d (svn r27848) -Update from Eints:
korean: 43 changes by telk5093
spanish: 6 changes by SilverSurferZzZ
2017-04-06 17:45:37 +00:00
Jonathan G Rennison
8317eac918 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
2017-04-01 01:14:28 +01:00
peter1138
065a0547e2 (svn r27832) -Fix: Missing or incorrect colour codes in translations 2017-03-27 22:00:45 +00:00
peter1138
54025df392 (svn r27832) -Fix: Missing or incorrect colour codes in translations 2017-03-27 22:00:45 +00:00
translators
6ceb8a0d28 (svn r27824) -Update from Eints:
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
2017-03-24 18:45:45 +00:00
translators
2385f4adbc (svn r27824) -Update from Eints:
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
2017-03-24 18:45:45 +00:00
Jonathan G Rennison
b3fd11efd2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp
2017-03-19 12:27:24 +00:00
alberth
17b46109ad (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 2017-03-18 20:49:24 +00:00
alberth
49c0facf2e (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 2017-03-18 20:49:24 +00:00
alberth
119965125d (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 2017-03-18 20:48:27 +00:00
alberth
2f1d808781 (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 2017-03-18 20:48:27 +00:00
alberth
7c3004c785 (svn r27798) -Change: Also remove obsolete string from the other languages 2017-03-18 20:45:18 +00:00
alberth
85ed4975bf (svn r27798) -Change: Also remove obsolete string from the other languages 2017-03-18 20:45:18 +00:00
Jonathan G Rennison
ac69b746ab Merge branch 'master' into jgrpp
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
2017-03-12 20:37:26 +00:00
frosch
bc61ff380a (svn r27777) -Doc: Yearly increment 2017-03-11 16:49:51 +00:00
frosch
15032bd765 (svn r27777) -Doc: Yearly increment 2017-03-11 16:49:51 +00:00
Jonathan G Rennison
54494a0a7c Merge branch 'send_money_company' into jgrpp 2017-03-03 22:42:07 +00:00
patch-import
f820543391 Import give money to company patch
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311

Fix language files and minor formatting issues
2017-03-02 00:09:23 +00:00
translators
a8f9520bbd (svn r27763) -Update from Eints:
korean: 6 changes by telk5093
frisian: 2 changes by Fopper
russian: 5 changes by Lone_Wolf
2017-03-01 18:45:37 +00:00
translators
f73f1f730b (svn r27763) -Update from Eints:
korean: 6 changes by telk5093
frisian: 2 changes by Fopper
russian: 5 changes by Lone_Wolf
2017-03-01 18:45:37 +00:00
Jonathan G Rennison
a6168dd2f0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/company_sl.cpp
2017-02-28 00:15:45 +00:00
translators
d5c6760c85 (svn r27753) -Update from Eints: 2017-02-26 18:45:43 +00:00
translators
b264dd2a8d (svn r27753) -Update from Eints: 2017-02-26 18:45:43 +00:00
alberth
fa81e20390 (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 2017-02-26 15:34:57 +00:00
alberth
07254a238d (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 2017-02-26 15:34:57 +00:00
Jonathan G Rennison
bdc5820836 Merge branch 'master' into jgrpp
# Conflicts:
#	src/road_cmd.cpp
2017-02-22 21:13:04 +00:00
translators
9eff17e66b (svn r27747) -Update from Eints:
korean: 7 changes by telk5093
2017-02-17 18:45:37 +00:00
translators
92905a3deb (svn r27747) -Update from Eints:
korean: 7 changes by telk5093
2017-02-17 18:45:37 +00:00
Jonathan G Rennison
e474f3b740 Merge remote-tracking branch 'kiwitreekor/jgrpp' into jgrpp 2017-02-13 19:14:31 +00:00
kiwitreekor
daa9671aee Translation update for JGRPP 0.17.0
Add String STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS and STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS_HELPTEXT
2017-02-13 18:08:16 +09:00
Jonathan G Rennison
9782d70c53 Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/lang/korean.txt
2017-02-05 19:05:09 +00:00
translators
cd18f2c10c (svn r27740) -Update from Eints:
korean: 1 change by telk5093
2017-01-25 18:45:36 +00:00
translators
ecd579f3ae (svn r27740) -Update from Eints:
korean: 1 change by telk5093
2017-01-25 18:45:36 +00:00