Skip to content

Commit 4400a01

Browse files
committed
Automatic merge of T1.5.1-1004-g6fd841761e and 24 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 8f695a4: Blueprint/train car operations UI window - Pull request #885 at 2728d6d: feat: Add notifications to Menu - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #900 at c27f32d: DMI updates - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #912 at 359cfee: New Triple Valve Features Vol. 2 - Pull request #922 at a3bc9e7: Autopilot for timetable mode - Pull request #946 at 91a03af: Advanced track sounds - Pull request #949 at da7663b: Oil Burning Locomotive - Pull request #952 at 8347095: Investigation - Pulsing graphics - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 84c2f4b: Add Support for Multiple Track Profiles - Pull request #956 at 406cba6: Map settings saved - Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - Pull request #960 at c8e2a28: Fix draw state name in scripts - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #963 at 2d5a67d: Fix dynamic brake force indicator - Pull request #964 at b11c894: fix: Warning CA1417: Do not use the 'OutAttribute' for string parameter - Pull request #965 at 7554f02: style: Renormalize line endings
26 parents ecaa6d7 + 6fd8417 + dfc715e + d00beb9 + f92de76 + 8f695a4 + 2728d6d + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + a3bc9e7 + 91a03af + da7663b + 8347095 + a519452 + 84c2f4b + 406cba6 + 2452cb0 + c8e2a28 + 46d0472 + 2d5a67d + b11c894 + 7554f02 commit 4400a01

File tree

9 files changed

+11322
-11322
lines changed

9 files changed

+11322
-11322
lines changed

Source/Locales/Contrib/Contrib.pot

Lines changed: 1975 additions & 1975 deletions
Large diffs are not rendered by default.

Source/Locales/Menu/Menu.pot

Lines changed: 1380 additions & 1380 deletions
Large diffs are not rendered by default.

Source/Locales/ORTS.Common/ORTS.Common.pot

Lines changed: 1143 additions & 1143 deletions
Large diffs are not rendered by default.
Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
1-
msgid ""
2-
msgstr ""
3-
"Project-Id-Version: PACKAGE VERSION\n"
4-
"POT-Creation-Date: 2023-12-03 15:16:45+0100\n"
5-
"PO-Revision-Date: 2023-12-03 15:16:45+0100\n"
6-
"Last-Translator: \n"
7-
"Language-Team: \n"
8-
"MIME-Version: 1.0\n"
9-
"Content-Type: text/plain; charset=utf-8\n"
10-
"Content-Transfer-Encoding: 8bit\n"
11-
"X-Generator: MonoDevelop Gettext addin\n"
12-
13-
14-
#: ../../ORTS.Menu/Activities.cs:47
15-
msgid "- Explore Route -"
16-
msgstr ""
17-
18-
#: ../../ORTS.Menu/Activities.cs:51
19-
msgid "+ Explore in Activity Mode +"
20-
msgstr ""
21-
22-
#: ../../ORTS.Menu/Activities.cs:81
23-
msgid "Not same route:"
24-
msgstr ""
25-
26-
#: ../../ORTS.Menu/Activities.cs:85
27-
#: ../../ORTS.Menu/Consists.cs:47
28-
#: ../../ORTS.Menu/Consists.cs:71
29-
#: ../../ORTS.Menu/Consists.cs:196
30-
#: ../../ORTS.Menu/ORTimetables.cs:56
31-
#: ../../ORTS.Menu/ORTimetables.cs:78
32-
#: ../../ORTS.Menu/Paths.cs:63
33-
#: ../../ORTS.Menu/Routes.cs:49
34-
msgid "load error:"
35-
msgstr ""
36-
37-
#: ../../ORTS.Menu/Activities.cs:88
38-
#: ../../ORTS.Menu/Consists.cs:50
39-
#: ../../ORTS.Menu/Consists.cs:74
40-
#: ../../ORTS.Menu/Consists.cs:206
41-
#: ../../ORTS.Menu/Paths.cs:65
42-
#: ../../ORTS.Menu/Paths.cs:66
43-
#: ../../ORTS.Menu/Paths.cs:67
44-
#: ../../ORTS.Menu/Routes.cs:51
45-
msgid "unnamed:"
46-
msgstr ""
47-
48-
#: ../../ORTS.Menu/Activities.cs:94
49-
#: ../../ORTS.Menu/Consists.cs:54
50-
#: ../../ORTS.Menu/Consists.cs:78
51-
#: ../../ORTS.Menu/Consists.cs:215
52-
#: ../../ORTS.Menu/ORTimetables.cs:61
53-
#: ../../ORTS.Menu/ORTimetables.cs:83
54-
#: ../../ORTS.Menu/Paths.cs:71
55-
#: ../../ORTS.Menu/Routes.cs:56
56-
msgid "missing:"
57-
msgstr ""
58-
59-
#: ../../ORTS.Menu/Activities.cs:87
60-
#, csharp-format
61-
msgid "Activity '{0}' is excluded."
62-
msgstr ""
63-
64-
#: ../../ORTS.Menu/Consists.cs:185
65-
msgid "- Any Locomotive -"
66-
msgstr ""
67-
68-
#: ../../ORTS.Menu/Consists.cs:203
69-
#, csharp-format
70-
msgid "Locomotive '{0}' is excluded."
71-
msgstr ""
72-
73-
#: ../../ORTS.Menu/Paths.cs:168
74-
#, csharp-format
75-
msgid "Start at: {0}"
76-
msgstr ""
77-
78-
#: ../../ORTS.Menu/Paths.cs:169
79-
#, csharp-format
80-
msgid "Heading to: {0}"
81-
msgstr ""
82-
1+
msgid ""
2+
msgstr ""
3+
"Project-Id-Version: PACKAGE VERSION\n"
4+
"POT-Creation-Date: 2023-12-03 15:16:45+0100\n"
5+
"PO-Revision-Date: 2023-12-03 15:16:45+0100\n"
6+
"Last-Translator: \n"
7+
"Language-Team: \n"
8+
"MIME-Version: 1.0\n"
9+
"Content-Type: text/plain; charset=utf-8\n"
10+
"Content-Transfer-Encoding: 8bit\n"
11+
"X-Generator: MonoDevelop Gettext addin\n"
12+
13+
14+
#: ../../ORTS.Menu/Activities.cs:47
15+
msgid "- Explore Route -"
16+
msgstr ""
17+
18+
#: ../../ORTS.Menu/Activities.cs:51
19+
msgid "+ Explore in Activity Mode +"
20+
msgstr ""
21+
22+
#: ../../ORTS.Menu/Activities.cs:81
23+
msgid "Not same route:"
24+
msgstr ""
25+
26+
#: ../../ORTS.Menu/Activities.cs:85
27+
#: ../../ORTS.Menu/Consists.cs:47
28+
#: ../../ORTS.Menu/Consists.cs:71
29+
#: ../../ORTS.Menu/Consists.cs:196
30+
#: ../../ORTS.Menu/ORTimetables.cs:56
31+
#: ../../ORTS.Menu/ORTimetables.cs:78
32+
#: ../../ORTS.Menu/Paths.cs:63
33+
#: ../../ORTS.Menu/Routes.cs:49
34+
msgid "load error:"
35+
msgstr ""
36+
37+
#: ../../ORTS.Menu/Activities.cs:88
38+
#: ../../ORTS.Menu/Consists.cs:50
39+
#: ../../ORTS.Menu/Consists.cs:74
40+
#: ../../ORTS.Menu/Consists.cs:206
41+
#: ../../ORTS.Menu/Paths.cs:65
42+
#: ../../ORTS.Menu/Paths.cs:66
43+
#: ../../ORTS.Menu/Paths.cs:67
44+
#: ../../ORTS.Menu/Routes.cs:51
45+
msgid "unnamed:"
46+
msgstr ""
47+
48+
#: ../../ORTS.Menu/Activities.cs:94
49+
#: ../../ORTS.Menu/Consists.cs:54
50+
#: ../../ORTS.Menu/Consists.cs:78
51+
#: ../../ORTS.Menu/Consists.cs:215
52+
#: ../../ORTS.Menu/ORTimetables.cs:61
53+
#: ../../ORTS.Menu/ORTimetables.cs:83
54+
#: ../../ORTS.Menu/Paths.cs:71
55+
#: ../../ORTS.Menu/Routes.cs:56
56+
msgid "missing:"
57+
msgstr ""
58+
59+
#: ../../ORTS.Menu/Activities.cs:87
60+
#, csharp-format
61+
msgid "Activity '{0}' is excluded."
62+
msgstr ""
63+
64+
#: ../../ORTS.Menu/Consists.cs:185
65+
msgid "- Any Locomotive -"
66+
msgstr ""
67+
68+
#: ../../ORTS.Menu/Consists.cs:203
69+
#, csharp-format
70+
msgid "Locomotive '{0}' is excluded."
71+
msgstr ""
72+
73+
#: ../../ORTS.Menu/Paths.cs:168
74+
#, csharp-format
75+
msgid "Start at: {0}"
76+
msgstr ""
77+
78+
#: ../../ORTS.Menu/Paths.cs:169
79+
#, csharp-format
80+
msgid "Heading to: {0}"
81+
msgstr ""
82+

0 commit comments

Comments
 (0)