Merge remote-tracking branch 'upstream/master' into adjust-menu-for-russian-text

Author: Chris Jakeman

.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/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
 =============