Merge branch 'master' into release

leezer3 · Nov 23, 2022 · 9af7dfd · 9af7dfd
2 parents 59a8bc7 + 41f7018
commit 9af7dfd
Show file tree

Hide file tree

Showing 106 changed files with 2,130 additions and 807 deletions.
diff --git a/DebianControl.sh → VersionCreator.sh b/DebianControl.sh → VersionCreator.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
-#Set base development branch revision numbers
-#This needs to be bumped once we have a stable release branch
+
+# Basic shell script to create appropriate version numbers in non C# code (Debian packages, OS-X app bundles)
+#
+# First, set the base development branch revision numbers
+# This needs to be bumped once we have a stable release branch
 MajorVersion=1
 MinorVersion=5
 
@@ -27,7 +30,37 @@ else
 	InfoVersion=$MajorVersion.$MinorVersion.$Revision.$Minutes-$USER
 fi
 
-cat > installers/debian/DEBIAN/control << EOF
+# determine revision and build numbers
+	if [[ "$OSTYPE" == "darwin"* ]]; then
+cat > mac/OpenBVE.app/Contents/Info.plist << EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIdentifier</key>
+	<string>openbve.trainsimcentral.co.uk</string>
+	<key>CFBundleExecutable</key>
+	<string>OpenBVE</string>
+	<key>CFBundleIconFile</key>
+	<string>OpenBVE.icns</string>
+	<key>CFBundleName</key>
+	<string>OpenBVE</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$Version</string>
+	<key>CFBundleSignature</key>
+	<string>xmmd</string>
+	<key>CFBundleVersion</key>
+	<string>$Version</string>
+	<key>NSAppleScriptEnabled</key>
+	<string>NO</string>
+</dict>
+</plist>
+EOF
+chmod 644 mac/OpenBVE.app/Contents/Info.plist
+	else
+		cat > installers/debian/DEBIAN/control << EOF
 Package: openbve
 Priority: optional
 Section: universe/games
@@ -64,4 +97,6 @@ Description: realistic 3D train/railway simulator (main program)
  surround sound, and is written in the C# language.  Note that binary
  train extension plugins are not currently supported on Linux/Unix,
  because these would require Win32 emulation.
-EOF
+EOF
+	fi
+
diff --git a/assets/Controls/Default.controls b/assets/Controls/Default.controls
@@ -1,7 +1,7 @@
 ; Current control configuration
 ; =============================
 ; This file was automatically generated. Please modify only if you know what you're doing.
-; Default keyconfig version 3- 08.06.2017
+; Default keyconfig version 4- 10.10.2022
 
 POWER_INCREASE, keyboard, Z, 0
 POWER_DECREASE, keyboard, A, 0
@@ -35,6 +35,7 @@ ENGINE_START, keyboard, E, 0
 ENGINE_STOP, keyboard, E, 2
 DEVICE_CONSTSPEED, keyboard, BackSpace, 0
 PLAY_MIC_SOUNDS, keyboard, W, 0
+SANDERS, keyboard, S, 0
 SECURITY_S, keyboard, Space, 0
 SECURITY_A1, keyboard, Insert, 0
 SECURITY_A2, keyboard, Delete, 0

diff --git a/assets/Languages/ca-ES.xlf b/assets/Languages/ca-ES.xlf
@@ -63,6 +63,10 @@
 						<source>You already have the latest version.</source>
 						<target>Ja teniu la versió més recent.</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="updates_new">
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>Ja hi ha disponible la nova versió [version] ([date]) al lloc web oficial.</target>
@@ -2388,6 +2392,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Activa o desactiva el dispositiu de velocitat constant.</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Activa o desactiva el sistema de seguretat en alguns trens.</target>

diff --git a/assets/Languages/cs-CZ.xlf b/assets/Languages/cs-CZ.xlf
@@ -63,6 +63,10 @@
 						<source>You already have the latest version.</source>
 						<target>Máte nejaktuálnější verzi.</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="updates_new">
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>Nová verze [version] ([date]) je ke stažení na domovských stránkách.</target>
@@ -2370,6 +2374,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Activace/deaktivace udržování rychlosti</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Activace/deaktivace zabezpečovacího systému u některých vlaků</target>

diff --git a/assets/Languages/de-CH.xlf b/assets/Languages/de-CH.xlf
@@ -64,6 +64,10 @@
 						<source>You already have the latest version.</source>
 						<target>Das Programm ist bereits auf dem neuesten Stand.</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="updates_new">
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>Die neue Programmversion [version] ([date]) ist auf der offiziellen Homepage verfügbar.</target>
@@ -2371,6 +2375,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Aktiviert/Deaktiviert die Vorrichtung zum Halten der Geschwindigkeit</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Aktiviert/Deaktiviert auf manchen Zügen das Zugsicherungssystem</target>

diff --git a/assets/Languages/de-DE.xlf b/assets/Languages/de-DE.xlf
@@ -64,6 +64,10 @@
 						<source>You already have the latest version.</source>
 						<target>Das Programm ist bereits auf dem neuesten Stand.</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="updates_new">
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>Die neue Programmversion [version] ([date]) ist auf der offiziellen Homepage verfügbar.</target>
@@ -2370,6 +2374,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Aktiviert/Deaktiviert die Vorrichtung zum Halten der Geschwindigkeit</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Aktiviert/Deaktiviert auf manchen Zügen das Zugsicherungssystem</target>

diff --git a/assets/Languages/en-GB.xlf b/assets/Languages/en-GB.xlf
@@ -63,6 +63,10 @@
 						<source>You already have the latest version.</source>
 						<target>You already have the latest version.</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="updates_new">
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>The new version [version] ([date]) is available for download on the Official Homepage.</target>
@@ -2370,6 +2374,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Activates or deactivates the constant speed device</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Activates or deactivates the security system on some trains</target>

diff --git a/assets/Languages/en-US.xlf b/assets/Languages/en-US.xlf
@@ -50,6 +50,9 @@
 					<trans-unit id="updates_old">
 						<source>You already have the latest version.</source>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+					</trans-unit>
 					<trans-unit id="updates_new">
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 					</trans-unit>
@@ -1837,6 +1840,12 @@
 					<trans-unit id="device_constspeed">
 						<source>Activates or deactivates the constant speed device</source>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 					</trans-unit>

diff --git a/assets/Languages/es-ES.xlf b/assets/Languages/es-ES.xlf
@@ -68,6 +68,10 @@
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>La nueva versión [version] ([date]) está disponible para descargar en la página oficial.</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="close">
 						<source>Close</source>
 						<target>Cerrar</target>
@@ -2371,6 +2375,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Activa/desactiva el dispositivo de velocidad constante</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Activa/desactiva el sistema de seguridad en algunos trenes</target>

diff --git a/assets/Languages/fi-FI.xlf b/assets/Languages/fi-FI.xlf
@@ -67,6 +67,10 @@
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>Uusi versio [version] ([date]) on saatavilla.</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="close">
 						<source>Close</source>
 						<target>Sulje</target>
@@ -2370,6 +2374,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Aktivoi tai poistaa vakionopeuslaitteen toiminnan</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Aktivoi tai poistaa turvajärjestelmän joissakin junissa</target>

diff --git a/assets/Languages/fr-FR.xlf b/assets/Languages/fr-FR.xlf
@@ -67,6 +67,10 @@
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>Une nouvelle version [version] ([date]) est téléchargeable depuis le Site Web officiel.</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="close">
 						<source>Close</source>
 						<target>Fermer</target>
@@ -2370,6 +2374,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Active/désactive le dispositif de régulation de vitesse</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Active/désactive le système de sécurité sur certains trains</target>

diff --git a/assets/Languages/hu-HU.xlf b/assets/Languages/hu-HU.xlf
@@ -68,6 +68,10 @@
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>Új programváltozat tölthető le a honlapról: [version] ([date]).</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="close">
 						<source>Close</source>
 						<target>Bezárás</target>
@@ -2373,6 +2377,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Tempomat be/ki kapcsolása</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Biztonsági rendszer be/ki kapcsolása egyes vonatokon</target>

diff --git a/assets/Languages/id-ID.xlf b/assets/Languages/id-ID.xlf
@@ -67,6 +67,10 @@
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>Versi baru telah tersedia. Silakan download di web resmi: [version] ([date])</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="close">
 						<source>Close</source>
 						<target>Keluar</target>
@@ -2411,6 +2415,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Kecepatan konstan</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Sistem keamanan kereta</target>

diff --git a/assets/Languages/it-IT.xlf b/assets/Languages/it-IT.xlf
@@ -68,6 +68,10 @@
 						<source>The new version [version] ([date]) is available for download on the Official Homepage.</source>
 						<target>La nuova versione [version] ([date]) è disponibile sul sito ufficiale.</target>
 					</trans-unit>
+					<trans-unit id="updates_daily">
+						<source>The most recent nightly build from [date] is available for download.</source>
+						<target>The most recent nightly build from [date] is available for download.</target>
+					</trans-unit>
 					<trans-unit id="close">
 						<source>Close</source>
 						<target>Chiudi</target>
@@ -2371,6 +2375,14 @@
 						<source>Activates or deactivates the constant speed device</source>
 						<target>Attiva o disattiva il dispositivo di velocità costante</target>
 					</trans-unit>
+					<trans-unit id="play_micsounds">
+						<source>Activates or deactivates the system microphone soundsource</source>
+						<target>Activates or deactivates the system microphone soundsource</target>
+					</trans-unit>
+					<trans-unit id="sanders">
+						<source>Activates or deactivates the sanders</source>
+						<target>Activates or deactivates the sanders</target>
+					</trans-unit>
 					<trans-unit id="security_power">
 						<source>Activates or deactivates the security system on some trains</source>
 						<target>Attiva o disattiva il dispositivo di sicurezza su alcuni treni</target>