Solve merge problem with PR 751

Author: sweiland-openrails

Source/ORTS.Common/Input/UserCommand.cs

@@ -14,17 +14,6 @@ public enum UserCommand
         [GetString("Game Pause")] GamePause,
         [GetString("Game Screenshot")] GameScreenshot,
         [GetString("Game Fullscreen")] GameFullscreen,
-        /*
-         * comment to be removed
-         * 
-         */
-        //
-        [GetString("Game External Controller (RailDriver)")] GameExternalCabController,
-        //
-        /*
-         * comment to be removed
-         * 
-         */
         [GetString("Game Switch Ahead")] GameSwitchAhead,
         [GetString("Game Switch Behind")] [GetParticularString("SwitchPanel", "Switch Behind")] GameSwitchBehind,
         [GetString("Game Switch Picked")] [GetParticularString("SwitchPanel", "")] GameSwitchPicked,

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs

@@ -175,11 +175,26 @@ private void init2(UserCommand userCommandTop, UserCommand userCommandBottom)
 
         private string determineDescription(UserCommand userCommand)
         {
-            // get the user command enum description for SwitchPanel
-            string description = GetParticularStringAttribute.GetParticularPrettyName("SwitchPanel", userCommand);
 
-            // translate the description
-            description = capitalize(Viewer.Catalog.GetParticularString("SwitchPanel", description));
+            string description = "";
+
+            if (userCommand != ORTS.Common.Input.UserCommand.GameSwitchAhead)
+            {
+                // get the user command enum description for SwitchPanel
+                description = GetParticularStringAttribute.GetParticularPrettyName("SwitchPanel", userCommand);
+
+                // translate the description
+                description = capitalize(Viewer.Catalog.GetParticularString("SwitchPanel", description));
+            }
+            else
+            {
+                // this is a workaround to solve a merge conflict with PR 757 "Unify RailDriver code implementations"
+                // once both PR 757 and this one PR 831 are merged into master file this else can be removed
+                // and the file Source\ORTS.Common\Input\UserCommand.cs to be changed
+                description = capitalize(Viewer.Catalog.GetParticularString("SwitchPanel", "Switch Ahead"));
+            }
+
+
 
             return description;
         }