Merge branch 'master' into refactor-user-settings-location

Resolve conflict caused by
* migration of some functionality into the base class
* addition of Telemetry settings

Author: rwf-rr

.gitignore

@@ -366,4 +366,4 @@ healthchecksdb
 
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
-/Source/RunActivity/Properties/launchSettings.json
+/Source/**/Properties/launchSettings.json

Source/Contrib/DataCollector/Program.cs

@@ -29,7 +29,7 @@ class Program
         static void Main(string[] args)
         {
             if (args.Contains("/system", StringComparer.OrdinalIgnoreCase))
-                SystemInfo.WriteSystemDetails(Console.Out);
+                CollectSystem();
             else if (args.Contains("/tile-terrtex", StringComparer.OrdinalIgnoreCase))
                 CollectTileTerrtex(args);
             else
@@ -53,6 +53,12 @@ static void ShowHelp()
             Console.WriteLine("  /help          Show help and usage information");
         }
 
+        static void CollectSystem()
+        {
+            Console.Error.WriteLine("Collecting information...");
+            SystemInfo.WriteSystemDetails(Console.Out);
+        }
+
         struct TileTerrtexDirectory
         {
             public string Path;

Source/Contrib/SimulatorTester/UserSettings.cs

@@ -16,7 +16,7 @@
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
 using System.Collections.Generic;
-using ORTS.Settings;
+using ORTS.Common;
 
 namespace SimulatorTester
 {

Source/Documentation/Manual/appendices.rst

@@ -678,6 +678,19 @@ The value speed is the required speed value in dimension as set by the relevant
 Inclusion of speed definition is optional and need not be set if only approach control position functions
 are used.
 
+Signal light parameters
+-----------------------
+
+.. index::
+  single: ORTSSignalLightTex
+
+It is possible to have different light textures in the same signal, by inserting
+the following parameter in the signal light definition::
+
+    ORTSSignalLightTex ( "name" )
+
+Where **name** is the name of the texture to be used for the signal light.
+
 Signal aspect parameters
 ------------------------
 The following parameters can be included in signal aspect definitions.

Source/Documentation/Manual/cabs.rst

@@ -908,7 +908,7 @@ Linked two-state animations (doors type) are named ``<ORTSITEM1TWOSTATE>`` and
 The default animation speed for stopped/moving type animations is 8 FPS. 
 It may be modified with following parameter in the .sd file::
 
-   ESD_CustomAnimationSpeed ( 8 )
+   ESD_ORTSCustomAnimationFPS ( 8 )
 
 Examples of use are fan control, open/close of aerodynamic coverages of couplers 
 in high speed trains, menu pages switching.

Source/Documentation/Manual/images/options-general.png

@@ -129,6 +129,40 @@ Otherwise, if the loco has an Overspeed Monitor specified in its ENG file, then
 
 This monitor is enabled by checking the option.
 
+
+.. _telemetry:
+
+Telemetry
+---------
+
+.. image:: images/options-telemetry.png
+
+These options let you choose which (if any) anonymous data collection types you would like to enable, preview the data that will be collected, and visit the `telemetry server and source code <https://telemetry.openrails.org>`_.
+
+Each anonymous data collection type can be set to:
+
+- **Undecided (off)** - (default) no data is collected or sent, but we may ask if you want to participate via :ref:`notifications`
+- **Off** - no data is collected or sent
+- **On** - data is collected and sent automatically
+
+There is no option to allow you to check through the collected data before it is sent.
+
+Application, runtime, operating system, and hardware properties
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+This anonymous data collection type can be previewed to see what will be sent; for example::
+
+  Application = Open Rails U2025.01.31-1152 (X64)
+  Runtime     = .NET Framework 4.8.9290.0
+  System      = Microsoft Windows 11 Home 10.0.26100 (X64; en-GB; en-GB,en-US,ja-JP)
+  Memory      = 32,592 MB
+  CPU         = 12th Gen Intel(R) Core(TM) i7-1255U (GenuineIntel; 12 threads; 2,600 MHz)
+  GPU         = Intel(R) Iris(R) Xe Graphics (Intel Corporation; 128 MB)
+  Direct3D    = 12_1,12_0,11_1,11_0,10_1,10_0,9_3,9_2,9_1
+
+This is also included at the start of every :ref:`log file <driving-logfile>`.
+
+
 Audio Options
 =============
 

Source/Documentation/Manual/images/options-telemetry.png

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-11-09 17:45:26+0100\n"
-"PO-Revision-Date: 2024-11-09 17:45:30+0100\n"
+"POT-Creation-Date: 2025-01-25 11:57:31+0000\n"
+"PO-Revision-Date: 2025-01-25 11:57:33+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -628,11 +628,11 @@ msgstr ""
 msgid "&Finish"
 msgstr ""
 
-#: ../../Contrib/ContentManager/ContentManagerGUI.cs:92
+#: ../../Contrib/ContentManager/ContentManagerGUI.cs:103
 msgid "Loading..."
 msgstr ""
 
-#: ../../Contrib/ContentManager/ContentManagerGUI.Designer.cs:115
+#: ../../Contrib/ContentManager/ContentManagerGUI.Designer.cs:116
 msgid "Open Rails Content Manager"
 msgstr ""