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
5 years ago
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
5 years ago
b60b193a6d
Cleanup: Remove out of date translations for changed string.
5 years ago
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
5 years ago
60da05cf2a
Update: Translations from eints
...
french: 3 changes by glx
5 years ago
f37304f9f5
Cleanup: Remove unused strings
5 years ago
7c539267ed
Merge branch 'master' into jgrpp
6 years ago
29b6b74ee1
Update: Translations from eints
...
french: 4 changes by glx
finnish: 2 changes by ln
6 years ago
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
6 years ago
e34a6c58ea
Update: Translations from eints
...
italian: 1 change by lorenzodv
french: 29 changes by glx
6 years ago
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
6 years ago
b3b89257f7
Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION"
6 years ago
28c5453926
Merge branch 'master' into jgrpp
6 years ago
004f54f4c8
Update: Translations from eints
...
hebrew: 23 changes by dnd_man
french: 45 changes by glx
6 years ago
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
6 years ago
6a6ffddc5f
Update: Translations from eints
...
greek: 46 changes by kyrm
italian: 44 changes by lorenzodv
6 years ago
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
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
6 years ago
7eca4a9b47
Update: Translations from eints
...
french: 5 changes by glx
6 years ago
889175f7ad
Update: Translations from eints
...
croatian: 1 change by VoyagerOne
italian: 1 change by lorenzodv
french: 1 change by glx
6 years ago
470ed2643e
Update: Translations from eints
...
croatian: 4 changes by VoyagerOne
french: 3 changes by glx
polish: 2 changes by McZapkie
6 years ago
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
2b662b448c
Update: Translations from eints
...
french: 1 change by glx
6 years ago
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.
6 years ago
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
6 years ago
3f40cd505d
Update: Translations from eints
...
croatian: 10 changes by VoyagerOne
italian: 4 changes by lorenzodv
french: 7 changes by glx
6 years ago
a806424ec1
Update: Translations from eints
...
italian: 6 changes by lorenzodv
french: 6 changes by glx
russian: 9 changes by Lone_Wolf
6 years ago
683b46a5b5
Cleanup: Remove unused strings from language files
6 years ago
cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. ( #6756 )
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
91464af737
(svn r27980) -Doc: Yearly increment
6 years ago
b1592787eb
(svn r27980) -Doc: Yearly increment
6 years ago
4a0d949d83
Merge branch 'master' into jgrpp
7 years ago
d7ef54268d
(svn r27955) -Update from Eints:
...
french: 2 changes by glx
7 years ago
bfd9e30c30
(svn r27955) -Update from Eints:
...
french: 2 changes by glx
7 years ago
1bc6fdef31
(svn r27953) -Cleanup: Adjust other languages for r27952
7 years ago
b394dd8468
(svn r27953) -Cleanup: Adjust other languages for r27952
7 years ago
71c133e203
Merge branch 'master' into jgrpp
7 years ago
146e4eddb6
(svn r27927) -Update from Eints:
...
french: 6 changes by glx
7 years ago
461b43e649
(svn r27927) -Update from Eints:
...
french: 6 changes by glx
7 years ago
f77a368268
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
a3f30a30df
(svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01)
7 years ago
2eae80bbfe
(svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01)
7 years ago
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
7 years ago
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
7 years ago
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
7 years ago
fc60857b66
Merge branches 'adjacent_crossings' and 'zoning' into jgrpp
7 years ago
bf30576255
(svn r27804) -Update from Eints:
...
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
7 years ago
8c49f7b98a
(svn r27804) -Update from Eints:
...
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
7 years ago
b3fd11efd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
7 years ago
Jonathan G Rennison
translators
Peter Nelson
Niels Martin Hansen
Oskari Leppäaho
PeterN
frosch
alberth