Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated.

Author: mbm-OR

Source/RunActivity/Viewer3D/Popups/MultiPlayerWindow.cs

@@ -133,7 +133,7 @@ protected override ControlLayout Layout(ControlLayout layout)
                 var TimeHboxPositionY = 0;
                 foreach (var data in labels)
                 {
-                    if (data.FirstCol.Contains(Viewer.Catalog.GetString("NwLn")))
+                    if (data.FirstCol.Contains("NwLn"))
                     {
                         var hbox = vbox.AddLayoutHorizontalLineOfText();
                         hbox.Add(new Label(colWidth * 2, hbox.RemainingHeight, " "));
@@ -319,7 +319,7 @@ void AddLabel(ListLabel label)
             }
             void AddSeparator() => AddLabel(new ListLabel
             {
-                FirstCol = Viewer.Catalog.GetString("Sprtr"),
+                FirstCol = "Sprtr",
             });
 
             labels.Clear();

Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs

@@ -274,7 +274,7 @@ protected override ControlLayout Layout(ControlLayout layout)
                 var TimeHboxPositionY = 0;
                 foreach (var data in labels.ToList())
                 {
-                    if (data.FirstCol.Contains(Viewer.Catalog.GetString("NwLn")))
+                    if (data.FirstCol.Contains("NwLn"))
                     {
                         var hbox = vbox.AddLayoutHorizontalLineOfText();
                         hbox.Add(new Label(colWidth * 2, hbox.RemainingHeight, " "));
@@ -573,7 +573,7 @@ void AddLabel(ListLabel label)
             }
             void AddSeparator() => AddLabel(new ListLabel
             {
-                FirstCol = Viewer.Catalog.GetString("Sprtr"),
+                FirstCol = "Sprtr",
             });
 
             TrainCar trainCar = viewer.PlayerLocomotive;

Source/RunActivity/Viewer3D/WebServices/TrackMonitorDisplay.cs

@@ -277,7 +277,7 @@ void AddLabel(ListLabel label)
             }
             void AddSeparator() => AddLabel(new ListLabel
             {
-                FirstCol = Viewer.Catalog.GetString("Sprtr"),
+                FirstCol = "Sprtr",
             });
 
             // Always get train details to pass on to TrackMonitor.
@@ -604,7 +604,7 @@ private static void DrawManualModeInfo(List<ListLabel> labels, Train.TrainInfo t
             // Draw train position line
             ListLabel DarkGraySeparator(ListLabel _) => new ListLabel
             {
-                FirstCol = Viewer.Catalog.GetString("SprtrDarkGray"),
+                FirstCol = "SprtrDarkGray",
             };
             ChangeLabelAt(labels, ItemLocationToRow(zeroObjectPointTop, zeroObjectPointTop) + 1, DarkGraySeparator);
             ChangeLabelAt(labels, ItemLocationToRow(zeroObjectPointBottom, zeroObjectPointBottom) - 1, DarkGraySeparator);

Source/RunActivity/Viewer3D/WebServices/TrainDrivingDisplay.cs

@@ -183,7 +183,7 @@ void AddLabel(ListLabel label)
             }
             void AddSeparator() => AddLabel(new ListLabel
             {
-                FirstCol = Viewer.Catalog.GetString("Sprtr"),
+                FirstCol = "Sprtr",
             });
 
             TrainCar trainCar = viewer.PlayerLocomotive;