Skip to content

Commit eafac6c

Browse files
authored
Merge pull request #487 from openrails/release/1.4
Merge pull request #482 from Sharpe49/power-supply-fix-toggle-player-engine
2 parents 8d43886 + 528d2f5 commit eafac6c

File tree

27 files changed

+5004
-3765
lines changed

27 files changed

+5004
-3765
lines changed

Source/Locales/Contrib/qps-ploc.po

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: Contrib\n"
4-
"POT-Creation-Date: 2019-05-19 02:21:30+0200\n"
5-
"PO-Revision-Date: 2019-05-19 02:21:31+0200\n"
4+
"POT-Creation-Date: 2021-09-15 03:48:20+0200\n"
5+
"PO-Revision-Date: 2021-09-15 03:48:20+0200\n"
66
"Last-Translator: \n"
77
"Language-Team: Open Rails Dev Team\n"
88
"Language: qps-ploc\n"
@@ -122,7 +122,7 @@ msgstr "[HôřñÞřôƥèřƭïèƨ !!!]"
122122
#: ../../Contrib/ActivityEditor/ActivityEditor/Activity/StartActivity.Designer.cs:111
123123
#: ../../Contrib/ActivityEditor/ActivityEditor/Activity/StartActivity.Designer.cs:339
124124
#: ../../Contrib/ActivityEditor/ActivityEditor/Wizard/ActivityDescr.cs:92
125-
#: ../../Contrib/ActivityEditor/AEWizard/ActivityDescr.cs:92
125+
#: ../../Contrib/ActivityEditor/AEWizard/ActivityDescr.cs:91
126126
msgid "Activity Description"
127127
msgstr "[ÂçƭïƲïƭ¥ Ðèƨçřïƥƭïôñ !!!]"
128128

@@ -200,7 +200,7 @@ msgstr "[WÂÌT ÂçƭïƲïƭ¥ Ðèƨçřïƥƭïôñ !!!]"
200200
msgid "WaitActivity"
201201
msgstr "[WáïƭÂçƭïƲïƭ¥ !!!]"
202202

203-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/ActEditor.cs:530
203+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/ActEditor.cs:524
204204
msgid "NoMoreAct"
205205
msgstr "[NôMôřèÂçƭ !!!]"
206206

@@ -283,8 +283,8 @@ msgid "Status"
283283
msgstr "[§ƭáƭúƨ !!!]"
284284

285285
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/ActEditor.Designer.cs:302
286-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2025
287-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2127
286+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2026
287+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2128
288288
msgid "v"
289289
msgstr "[Ʋ !!!]"
290290

@@ -365,25 +365,25 @@ msgstr "[Çℓïçƙ ƭô Éδïƭ Mèƭáδáƭá ƒôř á ƨƥèçïƒïèδ
365365
msgid "Form1"
366366
msgstr "[Fôř₥1 !!!]"
367367

368-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:163
368+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:164
369369
msgid "Route MetaData"
370370
msgstr "[Rôúƭè MèƭáÐáƭá !!!]"
371371

372-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2003
373-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2092
372+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2004
373+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2093
374374
msgid "Display"
375375
msgstr "[Ðïƨƥℓᥠ!!!]"
376376

377-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2014
378-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2116
377+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2015
378+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2117
379379
msgid "x"
380380
msgstr "[ж !!!]"
381381

382-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2040
382+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2041
383383
msgid "Tag"
384384
msgstr "[Táϱ !!!]"
385385

386-
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2106
386+
#: ../../Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs:2107
387387
msgid "Station"
388388
msgstr "[§ƭáƭïôñ !!!]"
389389

@@ -592,19 +592,19 @@ msgid "TrackSegmentInterface"
592592
msgstr "[Třáçƙ§èϱ₥èñƭÌñƭèřƒáçè !!!]"
593593

594594
#: ../../Contrib/ActivityEditor/ActivityEditor/Wizard/ActivityDescr.cs:108
595-
#: ../../Contrib/ActivityEditor/AEWizard/ActivityDescr.cs:108
595+
#: ../../Contrib/ActivityEditor/AEWizard/ActivityDescr.cs:107
596596
msgid "Activity Name"
597597
msgstr "[ÂçƭïƲïƭ¥ Ná₥è !!!]"
598598

599599
#: ../../Contrib/ActivityEditor/ActivityEditor/Wizard/ActivityDescr.cs:124
600600
#: ../../Contrib/ActivityEditor/ActivityEditor/Wizard/SelectRoute.cs:69
601-
#: ../../Contrib/ActivityEditor/AEWizard/ActivityDescr.cs:124
601+
#: ../../Contrib/ActivityEditor/AEWizard/ActivityDescr.cs:123
602602
#: ../../Contrib/ActivityEditor/AEWizard/SelectRoute.cs:69
603603
msgid "Route Path"
604604
msgstr "[Rôúƭè Þáƭλ !!!]"
605605

606606
#: ../../Contrib/ActivityEditor/ActivityEditor/Wizard/ActivityDescr.cs:141
607-
#: ../../Contrib/ActivityEditor/AEWizard/ActivityDescr.cs:141
607+
#: ../../Contrib/ActivityEditor/AEWizard/ActivityDescr.cs:140
608608
msgid "Activity Editor: Create new activity"
609609
msgstr "[ÂçƭïƲïƭ¥ Éδïƭôř: Çřèáƭè ñèω áçƭïƲïƭ¥ !!!]"
610610

@@ -674,17 +674,17 @@ msgstr "[£ôáδïñϱ... !!!]"
674674
msgid "Open Rails Content Manager"
675675
msgstr "[Óƥèñ Ráïℓƨ Çôñƭèñƭ Máñáϱèř !!!]"
676676

677-
#: ../../Contrib/TrackViewer/TrackViewer.cs:626
677+
#: ../../Contrib/TrackViewer/TrackViewer.cs:625
678678
msgid ""
679679
"The path you are working on has un-saved changes.\n"
680680
msgstr ""
681681
"[Tλè ƥáƭλ ¥ôú ářè ωôřƙïñϱ ôñ λáƨ úñ-ƨáƲèδ çλáñϱèƨ.\n !!!]"
682682

683-
#: ../../Contrib/TrackViewer/TrackViewer.cs:628
683+
#: ../../Contrib/TrackViewer/TrackViewer.cs:627
684684
msgid "Do you really want to Quit?"
685685
msgstr "[Ðô ¥ôú řèáℓℓ¥ ωáñƭ ƭô Qúïƭ? !!!]"
686686

687-
#: ../../Contrib/TrackViewer/TrackViewer.cs:731
687+
#: ../../Contrib/TrackViewer/TrackViewer.cs:730
688688
#, csharp-format
689689
msgid ""
690690
"Route cannot be loaded.\n"
@@ -693,7 +693,7 @@ msgstr ""
693693
"[Rôúƭè çáññôƭ βè ℓôáδèδ.\n"
694694
"Éжƭèñƨïôñ {0} ïƨ ñôƭ ƨúƥƥôřƭèδ !!!]"
695695

696-
#: ../../Contrib/TrackViewer/TrackViewer.cs:738
696+
#: ../../Contrib/TrackViewer/TrackViewer.cs:737
697697
#, csharp-format
698698
msgid ""
699699
"Route cannot be loaded.\n"
@@ -702,7 +702,7 @@ msgstr ""
702702
"[Rôúƭè çáññôƭ βè ℓôáδèδ.\n"
703703
"{0} δôèƨ ñôƭ èжïƨƭ !!!]"
704704

705-
#: ../../Contrib/TrackViewer/TrackViewer.cs:744
705+
#: ../../Contrib/TrackViewer/TrackViewer.cs:743
706706
#, csharp-format
707707
msgid ""
708708
"Route cannot be loaded.\n"
@@ -713,7 +713,7 @@ msgstr ""
713713
"Wλïℓè ƭř¥ïñϱ ƭô ôƥèñ {0} ƭλè ƒôℓδèř {1} ωáƨ ïñƒèřřèδ áƨ (M§T§ ôř ƨï₥ïℓář) "
714714
"ïñƨƭáℓℓ ƒôℓδèř βúƭ δôèƨ ñôƭ çôñƭáïñ èжƥèçƭèδ ƒïℓèƨ !!!]"
715715

716-
#: ../../Contrib/TrackViewer/TrackViewer.cs:769
716+
#: ../../Contrib/TrackViewer/TrackViewer.cs:768
717717
#, csharp-format
718718
msgid ""
719719
"Route cannot be loaded.\n"
@@ -722,60 +722,60 @@ msgstr ""
722722
"[Rôúƭè çáññôƭ βè ℓôáδèδ.\n"
723723
"{0} ƨô₥èλôω çôúℓδ ñôƭ βè ƭřáñƨℓáƭèδ ïñƭô á ℓôáδáβℓè řôúƭè !!!]"
724724

725-
#: ../../Contrib/TrackViewer/TrackViewer.cs:810
725+
#: ../../Contrib/TrackViewer/TrackViewer.cs:809
726726
msgid ""
727727
"Directory is not a valid install directory.\n"
728728
"The install directory needs to contain ROUTES, GLOBAL, ..."
729729
msgstr ""
730730
"[Ðïřèçƭôř¥ ïƨ ñôƭ á Ʋáℓïδ ïñƨƭáℓℓ δïřèçƭôř¥.\n"
731731
"Tλè ïñƨƭáℓℓ δïřèçƭôř¥ ñèèδƨ ƭô çôñƭáïñ RÓÛTɧ, G£Óߣ, ... !!!]"
732732

733-
#: ../../Contrib/TrackViewer/TrackViewer.cs:884
733+
#: ../../Contrib/TrackViewer/TrackViewer.cs:883
734734
msgid "Loading route..."
735735
msgstr "[£ôáδïñϱ řôúƭè... !!!]"
736736

737-
#: ../../Contrib/TrackViewer/TrackViewer.cs:909
737+
#: ../../Contrib/TrackViewer/TrackViewer.cs:908
738738
msgid "Route cannot be loaded. Sorry"
739739
msgstr "[Rôúƭè çáññôƭ βè ℓôáδèδ. §ôřř¥ !!!]"
740740

741-
#: ../../Contrib/TrackViewer/TrackViewer.cs:980
741+
#: ../../Contrib/TrackViewer/TrackViewer.cs:979
742742
msgid "Loading .pat file ..."
743743
msgstr "[£ôáδïñϱ .ƥáƭ ƒïℓè ... !!!]"
744744

745-
#: ../../Contrib/TrackViewer/TrackViewer.cs:983
745+
#: ../../Contrib/TrackViewer/TrackViewer.cs:982
746746
msgid "Processing .pat file ..."
747747
msgstr "[Þřôçèƨƨïñϱ .ƥáƭ ƒïℓè ... !!!]"
748748

749-
#: ../../Contrib/TrackViewer/TrackViewer.cs:1011
749+
#: ../../Contrib/TrackViewer/TrackViewer.cs:1010
750750
msgid "Path has been modified. Loading a new path will discard changes."
751751
msgstr "[Þáƭλ λáƨ βèèñ ₥ôδïƒïèδ. £ôáδïñϱ á ñèω ƥáƭλ ωïℓℓ δïƨçářδ çλáñϱèƨ. !!!]"
752752

753-
#: ../../Contrib/TrackViewer/TrackViewer.cs:1012
754-
#: ../../Contrib/TrackViewer/TrackViewer.cs:1093
753+
#: ../../Contrib/TrackViewer/TrackViewer.cs:1011
754+
#: ../../Contrib/TrackViewer/TrackViewer.cs:1092
755755
#: ../../Contrib/TrackViewer/Editing/SavePatFile.cs:99
756756
msgid "Do you want to continue?"
757757
msgstr "[Ðô ¥ôú ωáñƭ ƭô çôñƭïñúè? !!!]"
758758

759-
#: ../../Contrib/TrackViewer/TrackViewer.cs:1013
760-
#: ../../Contrib/TrackViewer/TrackViewer.cs:1094
759+
#: ../../Contrib/TrackViewer/TrackViewer.cs:1012
760+
#: ../../Contrib/TrackViewer/TrackViewer.cs:1093
761761
#: ../../Contrib/TrackViewer/Editing/SavePatFile.cs:85
762762
#: ../../Contrib/TrackViewer/Editing/SavePatFile.cs:102
763763
msgid "Trackviewer Path Editor"
764764
msgstr "[TřáçƙƲïèωèř Þáƭλ Éδïƭôř !!!]"
765765

766-
#: ../../Contrib/TrackViewer/TrackViewer.cs:1090
766+
#: ../../Contrib/TrackViewer/TrackViewer.cs:1089
767767
msgid ""
768768
"This will open every single .pat file for this route, (try to) fix all broken "
769769
"nodes, and save the modified path. "
770770
msgstr ""
771771
"[Tλïƨ ωïℓℓ ôƥèñ èƲèř¥ ƨïñϱℓè .ƥáƭ ƒïℓè ƒôř ƭλïƨ řôúƭè, (ƭř¥ ƭô) ƒïж áℓℓ βřôƙèñ "
772772
"ñôδèƨ, áñδ ƨáƲè ƭλè ₥ôδïƒïèδ ƥáƭλ. !!!]"
773773

774-
#: ../../Contrib/TrackViewer/TrackViewer.cs:1091
774+
#: ../../Contrib/TrackViewer/TrackViewer.cs:1090
775775
msgid "Potentially it will therefore change all .pat files on disc."
776776
msgstr "[Þôƭèñƭïáℓℓ¥ ïƭ ωïℓℓ ƭλèřèƒôřè çλáñϱè áℓℓ .ƥáƭ ƒïℓèƨ ôñ δïƨç. !!!]"
777777

778-
#: ../../Contrib/TrackViewer/TrackViewer.cs:1092
778+
#: ../../Contrib/TrackViewer/TrackViewer.cs:1091
779779
msgid ""
780780
"This can be useful when a route has been changed and you want all paths to be "
781781
"corrected."
@@ -867,12 +867,12 @@ msgstr "[§èℓèçƭ ƨƥèèδƥôƨƭ çôℓôř !!!]"
867867
msgid "Select other-paths color"
868868
msgstr "[§èℓèçƭ ôƭλèř-ƥáƭλƨ çôℓôř !!!]"
869869

870-
#: ../../Contrib/TrackViewer/Drawing/DrawTerrain.cs:633
870+
#: ../../Contrib/TrackViewer/Drawing/DrawTerrain.cs:625
871871
#, csharp-format
872872
msgid "Loading terrain ace-files {0}-{1} (scaled down with a factor {2})"
873873
msgstr "[£ôáδïñϱ ƭèřřáïñ áçè-ƒïℓèƨ {0}-{1} (ƨçáℓèδ δôωñ ωïƭλ á ƒáçƭôř {2}) !!!]"
874874

875-
#: ../../Contrib/TrackViewer/Drawing/DrawTerrain.cs:659
875+
#: ../../Contrib/TrackViewer/Drawing/DrawTerrain.cs:651
876876
msgid "Rescaling previously loaded ace-files"
877877
msgstr "[Rèƨçáℓïñϱ ƥřèƲïôúƨℓ¥ ℓôáδèδ áçè-ƒïℓèƨ !!!]"
878878

@@ -1105,8 +1105,8 @@ msgid "1"
11051105
msgstr "[1 !!!]"
11061106

11071107
#: ../../Contrib/TrackViewer/Editing/WaitPointDialog.xaml.cs:148
1108-
msgid "10"
1109-
msgstr "[10 !!!]"
1108+
msgid "11"
1109+
msgstr "[11 !!!]"
11101110

11111111
#: ../../Contrib/TrackViewer/Editing/WaitPointDialog.xaml.cs:269
11121112
msgid "99"
@@ -1531,7 +1531,6 @@ msgid " cars, and wait"
15311531
msgstr "[ çářƨ, áñδ ωáïƭ !!!]"
15321532

15331533
#: ../../Contrib/TrackViewer/Editing/WaitPointDialog.xaml:31
1534-
#: ../../Contrib/TrackViewer/Editing/WaitPointDialog.xaml:46
15351534
msgid "seconds. "
15361535
msgstr "[ƨèçôñδƨ. !!!]"
15371536

@@ -1551,6 +1550,10 @@ msgstr "[ÂÌ ƭřáïñ řè9úèƨƭ ƭô ƥáƨƨ řèδ ƨïϱñáℓ !!!]"
15511550
msgid "Blow horn for"
15521551
msgstr "[ßℓôω λôřñ ƒôř !!!]"
15531552

1553+
#: ../../Contrib/TrackViewer/Editing/WaitPointDialog.xaml:46
1554+
msgid "seconds. 11 = American horn sequence."
1555+
msgstr "[ƨèçôñδƨ. 11 = Â₥èřïçáñ λôřñ ƨè9úèñçè. !!!]"
1556+
15541557
#: ../../Contrib/TrackViewer/Editing/WaitPointDialog.xaml:50
15551558
msgid "Wait time code as decimal ="
15561559
msgstr "[Wáïƭ ƭï₥è çôδè áƨ δèçï₥áℓ = !!!]"

Source/Locales/Menu/Menu.pot

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
4-
"POT-Creation-Date: 2021-05-09 16:19:47+0200\n"
5-
"PO-Revision-Date: 2021-05-09 16:19:47+0200\n"
4+
"POT-Creation-Date: 2021-09-15 03:48:20+0200\n"
5+
"PO-Revision-Date: 2021-09-15 03:48:20+0200\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"MIME-Version: 1.0\n"
@@ -1188,30 +1188,30 @@ msgid "Explore in Activity Mode"
11881188
msgstr ""
11891189

11901190
#: ../../Menu/ResumeForm.cs:160
1191-
#: ../../Menu/ResumeForm.cs:196
1191+
#: ../../Menu/ResumeForm.cs:195
11921192
msgid "Explore Route"
11931193
msgstr ""
11941194

1195-
#: ../../Menu/ResumeForm.cs:243
1195+
#: ../../Menu/ResumeForm.cs:242
11961196
msgid ""
11971197
"To prevent crashes and unexpected behaviour, Open Rails invalidates games "
11981198
"saved from older versions if they fail to restore.\n"
11991199
msgstr ""
12001200

1201-
#: ../../Menu/ResumeForm.cs:231
1201+
#: ../../Menu/ResumeForm.cs:230
12021202
#, csharp-format
12031203
msgid ""
12041204
"Warning: Save {0} found from a route with an unexpected name:\n"
12051205
"{1}.\n"
12061206
"\n"
12071207
msgstr ""
12081208

1209-
#: ../../Menu/ResumeForm.cs:245
1209+
#: ../../Menu/ResumeForm.cs:244
12101210
#, csharp-format
12111211
msgid "{0} of {1} saves for this route are no longer valid."
12121212
msgstr ""
12131213

1214-
#: ../../Menu/ResumeForm.cs:255
1214+
#: ../../Menu/ResumeForm.cs:254
12151215
#, csharp-format
12161216
msgid ""
12171217
"Restoring from a save made by version {1} of {0} may be incompatible with "
@@ -1220,7 +1220,7 @@ msgid ""
12201220
"Continue?"
12211221
msgstr ""
12221222

1223-
#: ../../Menu/ResumeForm.cs:263
1223+
#: ../../Menu/ResumeForm.cs:262
12241224
msgid ""
12251225
"The selected file contains Debrief Eval data.\n"
12261226
"But Debrief Evaluation checkbox (Main menu) is unchecked.\n"
@@ -1229,7 +1229,7 @@ msgid ""
12291229
"Continue?"
12301230
msgstr ""
12311231

1232-
#: ../../Menu/ResumeForm.cs:443
1232+
#: ../../Menu/ResumeForm.cs:441
12331233
#, csharp-format
12341234
msgid "{0} invalid saves have been deleted."
12351235
msgstr ""

0 commit comments

Comments
 (0)