Merge pull request #989 from mbm-OR/bugfix/Fix-TrainCarOperations-crash-locales

Fix: TrainCarOperations-crashes-locales

Author: mbm-OR

Source/Locales/RunActivity/cs.po

@@ -133,12 +133,6 @@ msgctxt "PowerSupply"
 msgid "On ongoing"
 msgstr "Běží"
 
-#. Context: PowerSupply
-#: ../../RunActivity/Common/Scripting/PowerSupply/AbstractPowerSupply.cs:81
-msgctxt "PowerSupply"
-msgid "On"
-msgstr "Zap"
-
 #. Context: Pantograph
 #: ../../RunActivity/Common/Scripting/PowerSupply/AbstractPowerSupply.cs:86
 msgctxt "Pantograph"
@@ -584,12 +578,6 @@ msgstr "Strojvedoucí"
 msgid "Auxiliary power"
 msgstr "Pomocný výkon"
 
-#. Context: PowerSupply
-#: ../../RunActivity/RollingStock/MSTSElectricLocomotive.cs:322
-msgctxt "PowerSupply"
-msgid "Power"
-msgstr "Výkon"
-
 #: ../../RunActivity/RollingStock/MSTSSteamLocomotive.cs:1573
 #: ../../RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs:203
 msgid "Scoop broken because activated outside through"
@@ -3225,3 +3213,28 @@ msgstr "Spotř."
 #~ msgctxt "Labels"
 #~ msgid "none"
 #~ msgstr "není"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Engine"
+msgstr "Lokomotiva"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "On"
+msgstr "Zap"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "Power"
+msgstr "Výkon"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Running"
+msgstr "Motor běží"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Stopped"
+msgstr "Motor zastaven"

Source/Locales/RunActivity/da.po

@@ -96,12 +96,6 @@ msgctxt "PowerSupply"
 msgid "On ongoing"
 msgstr "Starter op"
 
-#. Context: PowerSupply
-#: ../../RunActivity/Common/Scripting/PowerSupply/AbstractPowerSupply.cs:81
-msgctxt "PowerSupply"
-msgid "On"
-msgstr "Til"
-
 #. Context: Pantograph
 #: ../../RunActivity/Common/Scripting/PowerSupply/AbstractPowerSupply.cs:86
 msgctxt "Pantograph"
@@ -549,12 +543,6 @@ msgstr "Fører"
 msgid "Auxiliary power"
 msgstr "Ekstra effekt"
 
-#. Context: PowerSupply
-#: ../../RunActivity/RollingStock/MSTSElectricLocomotive.cs:322
-msgctxt "PowerSupply"
-msgid "Power"
-msgstr "Effekt"
-
 #: ../../RunActivity/RollingStock/MSTSSteamLocomotive.cs:1366
 msgid "Tender coal supply is empty. Your loco will fail."
 msgstr "Kulvognen er tom. Dit lokomotiv vil fejle."
@@ -2896,3 +2884,28 @@ msgstr ""
 #~ msgctxt "Labels"
 #~ msgid "none"
 #~ msgstr "ingen"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Engine"
+msgstr "Motor"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "On"
+msgstr "Til"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "Power"
+msgstr "Effekt"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Running"
+msgstr "Kører"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Stopped"
+msgstr "Stoppet"

Source/Locales/RunActivity/de.po

@@ -4118,3 +4118,28 @@ msgstr "Fluss"
 #~ msgctxt "Switch"
 #~ msgid "change"
 #~ msgstr "stellen"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Engine"
+msgstr "Motor"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "On"
+msgstr "An"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "Power"
+msgstr "Strom"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Running"
+msgstr "An"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Stopped"
+msgstr "Aus"

Source/Locales/RunActivity/fr.po

@@ -3225,3 +3225,28 @@ msgstr "Débit"
 #, csharp-format
 #~ msgid "filtered by {0:F0}"
 #~ msgstr "filtré par {0:F0}"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Engine"
+msgstr "Moteur"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "On"
+msgstr "Actif"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "Power"
+msgstr "Puissance"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Running"
+msgstr "En marche"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Stopped"
+msgstr "Arrêté"

Source/Locales/RunActivity/hu.po

@@ -4993,3 +4993,28 @@ msgstr "Fogyaszt."
 
 #~ msgid "Coupler overloaded"
 #~ msgstr "Vonókészülék túlterhelve"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Engine"
+msgstr "Gép"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "On"
+msgstr "Van"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "Power"
+msgstr "Feszültség"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Running"
+msgstr "Üzemben"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Stopped"
+msgstr "Leállítva"

Source/Locales/RunActivity/it.po

@@ -3973,3 +3973,28 @@ msgstr ""
 #~ msgctxt "Labels"
 #~ msgid "none"
 #~ msgstr "nessuno"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Engine"
+msgstr "Motore"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "On"
+msgstr "Accesa"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "Power"
+msgstr "Alimentazione"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Running"
+msgstr "In funzione"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Stopped"
+msgstr "Spento"

Source/Locales/RunActivity/pt-BR.po

@@ -1506,3 +1506,23 @@ msgstr "O furo está quebrado, não é possível reabastecer"
 #: ../../RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs:230
 msgid "Scoop broken because activated outside through"
 msgstr "Scoop quebrado porque ativado do lado de fora"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Engine"
+msgstr "Motor"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "On"
+msgstr "Ligada"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Running"
+msgstr "Trabalhando"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Stopped"
+msgstr "Parado"

Source/Locales/RunActivity/ru.po

@@ -3814,3 +3814,28 @@ msgstr "Bak."
 #~ msgctxt "Coupler"
 #~ msgid "Push"
 #~ msgstr "Растян"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Engine"
+msgstr "ДВС"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "Power"
+msgstr "Напряж"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "On"
+msgstr "Вкл"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Running"
+msgstr "Работает"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Stopped"
+msgstr "Заглушен"

Source/Locales/RunActivity/zh-CN.po

@@ -97,12 +97,6 @@ msgctxt "PowerSupply"
 msgid "On ongoing"
 msgstr "正在进行"
 
-#. Context: PowerSupply
-#: ../../RunActivity/Common/Scripting/PowerSupply/AbstractPowerSupply.cs:81
-msgctxt "PowerSupply"
-msgid "On"
-msgstr "打开"
-
 #. Context: Pantograph
 #: ../../RunActivity/Common/Scripting/PowerSupply/AbstractPowerSupply.cs:86
 msgctxt "Pantograph"
@@ -546,12 +540,6 @@ msgstr "司机"
 msgid "Auxiliary power"
 msgstr "辅助动力"
 
-#. Context: PowerSupply
-#: ../../RunActivity/RollingStock/MSTSElectricLocomotive.cs:322
-msgctxt "PowerSupply"
-msgid "Power"
-msgstr "电力"
-
 #: ../../RunActivity/RollingStock/MSTSSteamLocomotive.cs:1411
 msgid "Tender coal supply is empty. Your loco will fail."
 msgstr "煤水车没有煤了"
@@ -2835,3 +2823,28 @@ msgstr "流动"
 
 #~ msgid "successfully"
 #~ msgstr "成功"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Engine"
+msgstr "柴油机"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "On"
+msgstr "打开"
+
+#. Context: PowerSupply
+msgctxt "PowerSupply"
+msgid "Power"
+msgstr "电力"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Running"
+msgstr "运行"
+
+#. Context: DieselEngine
+msgctxt "DieselEngine"
+msgid "Stopped"
+msgstr "停机"

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

@@ -1091,11 +1091,11 @@ public Texture2D locomotiveStatus1(int CarPosition)
                     string[] parts = data.Split(new string[] { " = " }, 2, StringSplitOptions.None);
                     string keyPart = parts[0];
                     string valuePart = parts?[1];
-                    if (keyPart.Contains(Viewer.Catalog.GetString("Engine")))
+                    if (keyPart.Contains(Viewer.Catalog.GetParticularString("DieselEngine","Engine")))
                     {
                         TrainCarViewer.PowerSupplyStatus = locomotiveStatus;
-                        Texture = valuePart.Contains(Viewer.Catalog.GetString("Running")) ? PowerOn
-                           : valuePart.Contains(Viewer.Catalog.GetString("Stopped")) ? PowerOff
+                        Texture = valuePart.Contains(Viewer.Catalog.GetParticularString("DieselEngine", "Running")) ? PowerOn
+                           : valuePart.Contains(Viewer.Catalog.GetParticularString("DieselEngine", "Stopped")) ? PowerOff
                            : PowerChanging;
                         break;
                     }