dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
da1ac73c02ae46dc4f93421ac518ce42310c05a2
openttd/src/lang
History
Jonathan G Rennison da1ac73c02 Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta 
# Conflicts:
#	src/lang/estonian.txt
#	src/lang/hungarian.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/packet.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/string_func.h
2021-09-18 22:10:04 +01:00
..
afrikaans.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
arabic_egypt.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
basque.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
belarusian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
brazilian_portuguese.txt
Merge branch 'master' into jgrpp-beta
2021-09-18 01:28:57 +01:00
bulgarian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
catalan.txt
Merge branch 'master' into jgrpp-beta
2021-09-18 01:28:57 +01:00
chuvash.txt
Add strings for velocity unit names
2021-06-13 20:49:35 +01:00
CMakeLists.txt
Merge branch 'master' into jgrpp
2021-04-25 02:14:58 +01:00
croatian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
czech.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
danish.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
dutch.txt
Merge branch 'master' into jgrpp-beta
2021-09-18 01:28:57 +01:00
english_AU.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
english_US.txt
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
2021-09-18 22:10:04 +01:00
english.txt
Merge branch 'master' into jgrpp-beta
2021-09-18 01:28:57 +01:00
esperanto.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
estonian.txt
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
2021-09-18 22:10:04 +01:00
faroese.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
finnish.txt
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
2021-09-18 22:10:04 +01:00
french.txt
Merge branch 'master' into jgrpp-beta
2021-09-18 01:28:57 +01:00
frisian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
gaelic.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
galician.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
german.txt
Merge branch 'master' into jgrpp-beta
2021-09-18 01:28:57 +01:00
greek.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
hebrew.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
hindi.txt
Update: Translations from eints
2021-04-25 18:04:52 +00:00
hungarian.txt
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
2021-09-18 22:10:04 +01:00
icelandic.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
ido.txt
Add strings for velocity unit names
2021-06-13 20:49:35 +01:00
indonesian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
irish.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
italian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
japanese.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
korean.txt
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
2021-09-18 22:10:04 +01:00
latin.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
latvian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
lithuanian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
luxembourgish.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
macedonian.txt
Add strings for velocity unit names
2021-06-13 20:49:35 +01:00
malay.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
maltese.txt
Add strings for velocity unit names
2021-06-13 20:49:35 +01:00
marathi.txt
Add strings for velocity unit names
2021-06-13 20:49:35 +01:00
norwegian_bokmal.txt
Merge branch 'master' into jgrpp-beta
2021-09-18 01:28:57 +01:00
norwegian_nynorsk.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
persian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
polish.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
portuguese.txt
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
2021-09-18 22:10:04 +01:00
romanian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
russian.txt
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
2021-09-18 22:10:04 +01:00
serbian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
simplified_chinese.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
slovak.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
slovenian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
spanish_MX.txt
Merge branch 'master' into jgrpp-beta
2021-09-18 01:28:57 +01:00
spanish.txt
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
2021-09-18 22:10:04 +01:00
swedish.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
tamil.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
thai.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
traditional_chinese.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
turkish.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
ukrainian.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
urdu.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
vietnamese.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00
welsh.txt
Partially revert "Update: Translations from eints"
2021-09-11 00:28:34 +01:00