Merge branch 'master' into release

leezer3 · Nov 9, 2023 · dec81fd · dec81fd
2 parents 0e9ff90 + c271bb4
commit dec81fd
Show file tree

Hide file tree

Showing 108 changed files with 6,432 additions and 1,019 deletions.
diff --git a/assets/Languages/ca-ES.xlf b/assets/Languages/ca-ES.xlf
@@ -1042,6 +1042,9 @@
 						<source>Export...</source>
 						<target>Exporta...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reinicialitza</target>

diff --git a/assets/Languages/cs-CZ.xlf b/assets/Languages/cs-CZ.xlf
@@ -1042,6 +1042,9 @@
 						<source>Export...</source>
 						<target>Export...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Obnovit na výchozí</target>

diff --git a/assets/Languages/de-CH.xlf b/assets/Languages/de-CH.xlf
@@ -1043,6 +1043,9 @@
 						<source>Export...</source>
 						<target>Exportieren...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Werkseinstellungen</target>

diff --git a/assets/Languages/de-DE.xlf b/assets/Languages/de-DE.xlf
@@ -1043,6 +1043,9 @@
 						<source>Export...</source>
 						<target>Exportieren...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Werkseinstellungen</target>

diff --git a/assets/Languages/en-GB.xlf b/assets/Languages/en-GB.xlf
@@ -1042,6 +1042,9 @@
 						<source>Export...</source>
 						<target>Export...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset to defaults</target>

diff --git a/assets/Languages/en-US.xlf b/assets/Languages/en-US.xlf
@@ -810,6 +810,9 @@
 					<trans-unit id="export">
 						<source>Export...</source>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 					</trans-unit>

diff --git a/assets/Languages/es-ES.xlf b/assets/Languages/es-ES.xlf
@@ -1043,6 +1043,9 @@
 						<source>Export...</source>
 						<target>Exportar...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Configuración por defecto</target>

diff --git a/assets/Languages/fi-FI.xlf b/assets/Languages/fi-FI.xlf
@@ -1042,6 +1042,9 @@
 						<source>Export...</source>
 						<target>Vie...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset to defaults</target>

diff --git a/assets/Languages/fr-FR.xlf b/assets/Languages/fr-FR.xlf
@@ -1042,6 +1042,9 @@
 						<source>Export...</source>
 						<target>Exporter...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset to defaults</target>

diff --git a/assets/Languages/hu-HU.xlf b/assets/Languages/hu-HU.xlf
@@ -1044,6 +1044,9 @@
 						<source>Export...</source>
 						<target>Exportálás...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Visszaállítás</target>

diff --git a/assets/Languages/id-ID.xlf b/assets/Languages/id-ID.xlf
@@ -1046,6 +1046,9 @@
 						<source>Export...</source>
 						<target>Ekspor...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset</target>

diff --git a/assets/Languages/it-IT.xlf b/assets/Languages/it-IT.xlf
@@ -1043,6 +1043,9 @@
 						<source>Export...</source>
 						<target>Esporta</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reimposta ai valori predefiniti</target>

diff --git a/assets/Languages/ja-JP.xlf b/assets/Languages/ja-JP.xlf
@@ -1043,6 +1043,9 @@
 						<source>Export...</source>
 						<target>書き出し...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>デフォルトに戻す</target>

diff --git a/assets/Languages/ko-KR.xlf b/assets/Languages/ko-KR.xlf
@@ -1043,6 +1043,9 @@
 						<source>Export...</source>
 						<target>내보내기...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset to defaults</target>

diff --git a/assets/Languages/ms_MY.xlf b/assets/Languages/ms_MY.xlf
@@ -1042,6 +1042,9 @@
 						<source>Export...</source>
 						<target>Eksport...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Set semula ke lalai</target>

diff --git a/assets/Languages/nb_NO.xlf b/assets/Languages/nb_NO.xlf
@@ -1045,6 +1045,9 @@
 					  <source>Export...</source>
 					  <target>Eksporter...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 					  <source>Reset to defaults</source>
 					  <target>Tilbakestill</target>

diff --git a/assets/Languages/nl-NL.xlf b/assets/Languages/nl-NL.xlf
@@ -1042,6 +1042,9 @@
 						<source>Export...</source>
 						<target>Exporteren...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset to defaults</target>

diff --git a/assets/Languages/pl-PL.xlf b/assets/Languages/pl-PL.xlf
@@ -1044,6 +1044,9 @@
 						<source>Export...</source>
 						<target>Eksportuj...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Ustawienia domyślne</target>

diff --git a/assets/Languages/pt-BR.xlf b/assets/Languages/pt-BR.xlf
@@ -1043,6 +1043,9 @@
 						<source>Export...</source>
 						<target>Exportar...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset to defaults</target>

diff --git a/assets/Languages/pt-PT.xlf b/assets/Languages/pt-PT.xlf
@@ -18,7 +18,7 @@
 				</trans-unit>
 				<trans-unit id="last_updated">
 					<source>2019-06-04</source>
-					<target state="translated">2023-08-27</target>
+					<target state="translated">2023-10-12</target>
 				</trans-unit>
 			</group>
 			<group id="openbve">
@@ -621,7 +621,7 @@
 					</trans-unit>
 					<trans-unit id="install_invalid">
 						<source>This file does not appear to be a valid openBVE package.</source>
-						<target>Este ficheiro não parece ser um pacote válido openBVE.</target>
+						<target state="translated">Este ficheiro não parece ser um pacote válido do openBVE.</target>
 					</trans-unit>
 					<trans-unit id="install_version_error">
 						<source>Package Version Error</source>
@@ -1049,6 +1049,9 @@
 						<source>Export...</source>
 						<target>Exportar...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Redefinir</target>
@@ -1293,7 +1296,7 @@
 					</trans-unit>
 					<trans-unit id="calibration_k">
 						<source>Move the wiper switch to OFF and press 'Next'.</source>
-						<target>Desligue o limpa´pára-brisas e carregue em 'Seguinte'.</target>
+						<target state="translated">Desligue o limpa-pára-brisas e carregue em 'Seguinte'.</target>
 					</trans-unit>
 					<trans-unit id="calibration_l">
 						<source>Move the wiper switch to FULL and press 'Next'.</source>
@@ -1547,7 +1550,7 @@
 					</trans-unit>
 					<trans-unit id="verbosity_accessibilityaids">
 						<source>Accessibility Aids</source>
-						<target>Accessibility Aids</target>
+						<target state="translated">Ajudas de acessibilidade</target>
 					</trans-unit>
 					<trans-unit id="advanced">
 						<source>Advanced Options</source>
@@ -1849,11 +1852,11 @@
 					</trans-unit>
 					<trans-unit id="almost_help_filesnotfound">
 						<source>Some issues were encountered while loading the route and train.\r\n\r\nAs some files could not be found, the route or train might not appear as intended. Try to redownload the route and train packages in order to ensure that you have a complete distribution.\r\n\r\nThe following list of issues might give additional information. You can still start the route by selecting "Ignore" from below.</source>
-						<target>Alguns problemas foram encontrados ao carregar a linha e o comboio.\r\n\r\nComo alguns ficheiros não foram encontrados, a linha e/ou comboio podem não aparecer correctamente. Tente obter novamente a linha e/ou o comboio para garantir que dispõe do pacote completo.\r\n\r\nA seguinte lista de problemas pode fornecer informações adicionais. Pode, ainda assim, iniciar a simulação seleccionando "Ignorar" no botão abaixo.</target>
+						<target state="translated">Foram encontrados alguns problemas ao carregar a linha e o comboio.\r\n\r\nComo alguns ficheiros não foram encontrados, a linha e/ou comboio podem não aparecer correctamente. Tente obter novamente a linha e/ou o comboio para garantir que dispõe do pacote completo.\r\n\r\nA seguinte lista de problemas pode fornecer informações adicionais. Pode, ainda assim, iniciar a simulação seleccionando "Ignorar" no botão abaixo.</target>
 					</trans-unit>
 					<trans-unit id="almost_help_general">
 						<source>Some issues were encountered while loading the route and train. If you are the route or train developer, it might be worth taking a look at the following list of issues.\r\n\r\nAs a regular user, you can select "Ignore" at this point to start the game.</source>
-						<target>Alguns problemas foram encontrados ao carregar a linha e o comboio. Caso seja o autor da linha ou do comboio, talvez valha a pena dar uma olhadela à seguinte lista de problemas.\r\n\r\nComo utilizador pode seleccionar "Ignorar" para poder iniciar a simulação.</target>
+						<target state="translated">Foram encontrados alguns problemas ao carregar a linha e o comboio. Caso seja o autor da linha ou do comboio, talvez valha a pena dar uma olhadela à seguinte lista de problemas.\r\n\r\nComo utilizador pode seleccionar "Ignorar" para poder iniciar a simulação.</target>
 					</trans-unit>
 					<trans-unit id="almost_show">
 						<source>Show issues</source>

diff --git a/assets/Languages/ro-RO.xlf b/assets/Languages/ro-RO.xlf
@@ -1043,6 +1043,9 @@
 						<source>Export...</source>
 						<target>Exportă...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset to defaults</target>

diff --git a/assets/Languages/ru-RU.xlf b/assets/Languages/ru-RU.xlf
@@ -1042,6 +1042,9 @@
 						<source>Export...</source>
 						<target>Экспортировать...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Сбросить</target>

diff --git a/assets/Languages/sk-SK.xlf b/assets/Languages/sk-SK.xlf
diff --git a/assets/Languages/uk-UA.xlf b/assets/Languages/uk-UA.xlf
@@ -1044,6 +1044,9 @@
 						<source>Export...</source>
 						<target>Експорт...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset to defaults</target>

diff --git a/assets/Languages/zh-CN.xlf b/assets/Languages/zh-CN.xlf
@@ -1047,6 +1047,9 @@
 						<source>Export...</source>
 						<target>导出...</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>重置为默认值</target>

diff --git a/assets/Languages/zh-HK.xlf b/assets/Languages/zh-HK.xlf
@@ -1058,6 +1058,9 @@
 						<source>Export...</source>
 						<target>匯出……</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>重置為預設值</target>

diff --git a/assets/Languages/zh-TW.xlf b/assets/Languages/zh-TW.xlf
@@ -1043,6 +1043,9 @@
 						<source>Export...</source>
 						<target>匯出……</target>
 					</trans-unit>
+					<trans-unit id="reset_question">
+						<source>Reset the current control configuration to the defaults?</source>
+					</trans-unit>
 					<trans-unit id="reset">
 						<source>Reset to defaults</source>
 						<target>Reset to defaults</target>

diff --git a/source/AssimpParser/Wavefront/ObjFileParser.cs b/source/AssimpParser/Wavefront/ObjFileParser.cs
@@ -466,7 +466,7 @@ protected void GetFace(PrimitiveType type)
 					{
 						++iStep;
 					}
-					while ((tmp = tmp / 10) != 0)
+					while ((tmp /= 10) != 0)
 					{
 						++iStep;
 					}

diff --git a/source/AssimpParser/X/XFileParser.cs b/source/AssimpParser/X/XFileParser.cs
@@ -1714,7 +1714,7 @@ protected void FilterHierarchy(Node node)
 					child.Meshes.Clear();
 
 					// transfer the transform as well
-					node.TrafoMatrix = node.TrafoMatrix * child.TrafoMatrix;
+					node.TrafoMatrix *= child.TrafoMatrix;
 
 					// then kill it
 					node.Children.Clear();