Skip to content

Commit d4ccd56

Browse files
committed
Automatic merge of T1.6-rc7-38-ge57a7a113 and 13 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 86d38a2: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1139 at 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. - Pull request #1143 at 71e57d2: Status in Work Orders popup set too fast - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 58de4c3: Particle Emitter Overhaul
15 parents 1051bc6 + e57a7a1 + e10390b + 2e06f85 + 86d38a2 + 270f22f + ba3c47f + 91d2d26 + 8ae6bb7 + 03c6f8f + 71e57d2 + 5845a1a + 689494b + fab5457 + 58de4c3 commit d4ccd56

File tree

12 files changed

+2131
-1830
lines changed

12 files changed

+2131
-1830
lines changed

Source/Contrib/ContentManager/ContentManagerGUI.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@ void searchBox_TextChanged(object sender, EventArgs e)
286286
finds.Add(new SearchResult(content, path));
287287

288288
foreach (var child in ((ContentType[])Enum.GetValues(typeof(ContentType))).SelectMany(ct => content.Get(ct)))
289-
pending.Add(path + " / " + child.Name, child);
289+
if (!pending.ContainsKey(path + " / " + child.Name))
290+
pending.Add(path + " / " + child.Name, child);
290291

291292
foreach (var child in ContentLink.Matches(ContentInfo.GetText(content)).Cast<Match>().Select(linkMatch => content.Get(linkMatch.Groups[1].Value, (ContentType)Enum.Parse(typeof(ContentType), linkMatch.Groups[2].Value))).Where(linkContent => linkContent != null))
292293
if (!pending.ContainsKey(path + " -> " + child.Name))

Source/Locales/Contrib/es.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: \n"
4-
"POT-Creation-Date: 2024-11-29 18:44:39+0000\n"
5-
"PO-Revision-Date: 2024-12-02 18:04+0100\n"
4+
"POT-Creation-Date: 2025-07-22 20:54:33+0100\n"
5+
"PO-Revision-Date: 2025-07-25 18:15+0200\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: es\n"
@@ -637,11 +637,11 @@ msgstr "Cancelar"
637637
msgid "&Finish"
638638
msgstr "&Final"
639639

640-
#: ../../Contrib/ContentManager/ContentManagerGUI.cs:92
640+
#: ../../Contrib/ContentManager/ContentManagerGUI.cs:103
641641
msgid "Loading..."
642642
msgstr "Cargando..."
643643

644-
#: ../../Contrib/ContentManager/ContentManagerGUI.Designer.cs:115
644+
#: ../../Contrib/ContentManager/ContentManagerGUI.Designer.cs:116
645645
msgid "Open Rails Content Manager"
646646
msgstr "Administrador Contenido Open Rails"
647647

0 commit comments

Comments
 (0)