Jonathan G Rennison
adf2210bc8
Merge branch 'master' into jgrpp
# Conflicts:
# src/genworld_gui.cpp
# src/lang/afrikaans.txt
# src/lang/arabic_egypt.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/esperanto.txt
# src/lang/estonian.txt
# src/lang/faroese.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/frisian.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/malay.txt
# src/lang/norwegian_bokmal.txt
# src/lang/norwegian_nynorsk.txt
# src/lang/persian.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/vietnamese.txt
# src/lang/welsh.txt
# src/saveload/afterload.cpp
2023-01-12 20:59:34 +00:00
..
2022-12-06 18:29:55 +00:00
2023-01-03 11:40:02 +00:00
2021-03-09 10:22:52 +01:00
2023-01-03 11:40:02 +00:00
2021-10-08 18:11:02 +01:00
2023-01-03 11:40:02 +00:00
2022-11-01 18:24:31 -06:00
2021-06-26 20:28:05 +02:00
2021-04-05 17:48:46 +01:00
2022-05-15 13:54:13 +01:00
2021-04-11 14:26:00 +02:00
2023-01-12 20:59:34 +00:00
2023-01-06 20:02:04 +00:00
2021-06-26 20:28:05 +02:00
2021-03-08 19:18:55 +01:00
2021-06-17 20:22:57 +02:00
2022-12-04 20:43:11 +00:00
2022-12-06 18:29:55 +00:00
2022-05-15 13:54:13 +01:00