New upstream version 4.2.4aupstream/4.2.4a

1 files changed, 14 insertions, 14 deletions

diff --git a/app/lib/params/On30-FastTrack.xtp b/app/lib/params/On30-FastTrack.xtp
index 34c2ec9..c4eb922 100644
--- a/app/lib/params/On30-FastTrack.xtp
+++ b/app/lib/params/On30-FastTrack.xtp
@@ -1,6 +1,6 @@
 CONTENTS On30/On2½ FastTrack Turnouts
 #Created By Dwyane Ward 13 SEP 2009
-TURNOUT On2½ "Fast Tracks	#4 WYE On30	TT-On30-Y-4"
+TURNOUT On30 "Fast Tracks	#4 WYE On30	TT-On30-Y-4"
 	U "Wye Turnout" "" "Fast Tracks" "#4 WYE On30" "TT-ON30-Y-4" 9.937500 7.180762 0.625000 0.625000 7.180762 9.937500 0.000000 0.031250 0
 	P "Left" 1 2 3
 	P "Right" 1 4 5
@@ -13,7 +13,7 @@ TURNOUT On2½ "Fast Tracks	#4 WYE On30	TT-On30-Y-4"
 	C 0 0.000000 68.964032 0.649325 -68.964032 0.000076 7.180914
 	S 0 0.000000 9.270286 -0.540926 9.937500 -0.625000
 	END
-TURNOUT On2½ "Fast Tracks	#5 WYE On30	TT-On30-Y-5"
+TURNOUT On30 "Fast Tracks	#5 WYE On30	TT-On30-Y-5"
 	U "Wye Turnout" "" "Fast Tracks" "#5 WYE On30" "TT-ON30-Y-5" 10.000000 5.739175 0.625000 0.625000 5.739175 10.000000 0.000000 0.031250 0
 	P "Left" 1 2 3
 	P "Right" 1 4 5
@@ -26,7 +26,7 @@ TURNOUT On2½ "Fast Tracks	#5 WYE On30	TT-On30-Y-5"
 	C 0 0.000000 62.480241 0.649351 -62.480241 0.000076 5.739327
 	S 0 0.000000 6.897789 -0.313203 10.000000 -0.625000
 	END
-TURNOUT On2½ "Fast Tracks	#6 WYE On30	TT-On30-Y-6"
+TURNOUT On30 "Fast Tracks	#6 WYE On30	TT-On30-Y-6"
 	U "Wye Turnout" "" "Fast Tracks" "#6 WYE On30" "TT-ON30-Y-6" 11.812500 4.780196 0.656250 0.656250 4.780196 11.812500 0.000000 0.031250 0
 	P "Left" 1 2 3
 	P "Right" 1 4 5
@@ -39,7 +39,7 @@ TURNOUT On2½ "Fast Tracks	#6 WYE On30	TT-On30-Y-6"
 	C 0 0.000000 79.433127 0.649284 -79.433127 0.000076 4.780348
 	S 0 0.000000 7.269237 -0.276308 11.812500 -0.656250
 	END
-TURNOUT On2½ "Fast Tracks	#6 3-WAY On30	TT-On30-W-6"
+TURNOUT On30 "Fast Tracks	#6 3-WAY On30	TT-On30-W-6"
 	U "3-way Turnout" "" "Fast Tracks" "#6 3-WAY On30" "TT-On30-W-6" 14.812500 9.594076 1.750000 16.687500 1.625000 9.594076 16.687500 0.000000 0.031250 0
 	P "Left" 1 2 3
 	P "Normal" 1 6
@@ -55,7 +55,7 @@ TURNOUT On2½ "Fast Tracks	#6 3-WAY On30	TT-On30-W-6"
 	S 0 0.000000 13.408751 -1.070768 16.687500 -1.625000
 	S 0 0.000000 0.649600 0.000000 16.687500 0.000000
 	END
-TURNOUT On2½ "Fast Tracks	#4 Left On30	TT-On30-T-4L"
+TURNOUT On30 "Fast Tracks	#4 Left On30	TT-On30-T-4L"
 	U "Regular Turnout" "" "Fast Tracks" "#4 Left On30" "TT-On30-T-4L" "#4 Right On30" "TT-On30-T-4R" 9.875000 14.477524 1.312500 9.875000 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -67,7 +67,7 @@ TURNOUT On2½ "Fast Tracks	#4 Left On30	TT-On30-T-4L"
 	C 0 0.000000 -32.611171 0.649643 32.611171 165.522400 14.477676
 	S 0 0.000000 8.802477 1.035562 9.875000 1.312500
 	END
-TURNOUT On2½ "Fast Tracks	#4 Right On30	TT-On30-T-4R"
+TURNOUT On30 "Fast Tracks	#4 Right On30	TT-On30-T-4R"
 	U "Regular Turnout" "" "Fast Tracks" "#4 Left On30" "TT-On30-T-4L" "#4 Right On30" "TT-On30-T-4R" 9.875000 14.477524 1.312500 9.875000 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -79,7 +79,7 @@ TURNOUT On2½ "Fast Tracks	#4 Right On30	TT-On30-T-4R"
 	C 0 0.000000 32.611171 0.649470 -32.611171 0.000076 14.477676
 	S 0 0.000000 8.802477 -1.035562 9.875000 -1.312500
 	END
-TURNOUT On2½ "Fast Tracks	#5 Left On30	TT-On30T-5L"
+TURNOUT On30 "Fast Tracks	#5 Left On30	TT-On30T-5L"
 	U "Regular Turnout" "" "Fast Tracks" "#5 Left On30" "TT-On30T-5L" "#5 Right On30" "TT-On30-T-5R" 11.250000 11.536969 1.312500 11.250000 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -91,7 +91,7 @@ TURNOUT On2½ "Fast Tracks	#5 Left On30	TT-On30T-5L"
 	C 0 0.000000 -41.284330 0.649655 41.284330 168.462955 11.537121
 	S 0 0.000000 8.906573 0.834135 11.250000 1.312500
 	END
-TURNOUT On2½ "Fast Tracks	#5 Right On30	TT-On30-T-5R"
+TURNOUT On30 "Fast Tracks	#5 Right On30	TT-On30-T-5R"
 	U "Regular Turnout" "" "Fast Tracks" "#5 Left On30" "TT-On30T-5L" "#5 Right On30" "TT-On30-T-5R" 11.250000 11.536969 1.312500 11.250000 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -103,7 +103,7 @@ TURNOUT On2½ "Fast Tracks	#5 Right On30	TT-On30-T-5R"
 	C 0 0.000000 41.284330 0.649436 -41.284330 0.000076 11.537121
 	S 0 0.000000 8.906573 -0.834135 11.250000 -1.312500
 	END
-TURNOUT On2½ "Fast Tracks	#6 Left On30	TT-On30-T-6L"
+TURNOUT On30 "Fast Tracks	#6 Left On30	TT-On30-T-6L"
 	U "Regular Turnout" "" "Fast Tracks" "#6 Left On30" "TT-On30-T-6L" "#6 Right On30" "TT-On30-T-6R" 10.812500 9.594076 1.125000 10.812500 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -115,7 +115,7 @@ TURNOUT On2½ "Fast Tracks	#6 Left On30	TT-On30-T-6L"
 	C 0 0.000000 -41.794418 0.649655 41.794418 170.405848 9.594228
 	S 0 0.000000 7.615446 0.584585 10.812500 1.125000
 	END
-TURNOUT On2½ "Fast Tracks	#6 Right On30	TT-On30-T-6R"
+TURNOUT On30 "Fast Tracks	#6 Right On30	TT-On30-T-6R"
 	U "Regular Turnout" "" "Fast Tracks" "#6 Left On30" "TT-On30-T-6L" "#6 Right On30" "TT-On30-T-6R" 10.812500 9.594076 1.125000 10.812500 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -127,7 +127,7 @@ TURNOUT On2½ "Fast Tracks	#6 Right On30	TT-On30-T-6R"
 	C 0 0.000000 41.794418 0.649434 -41.794418 0.000076 9.594228
 	S 0 0.000000 7.615446 -0.584585 10.812500 -1.125000
 	END
-TURNOUT On2½ "Fast Tracks	#7 Left On30	TT-On30-T-7L"
+TURNOUT On30 "Fast Tracks	#7 Left On30	TT-On30-T-7L"
 	U "Regular Turnout" "" "Fast Tracks" "#7 Left On30" "TT-On30-T-7L" "#7 Right On30" "TT-On30-T-7R" 13.312500 8.213218 1.125000 13.312500 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -139,7 +139,7 @@ TURNOUT On2½ "Fast Tracks	#7 Left On30	TT-On30-T-7L"
 	C 0 0.000000 -67.813569 0.649690 67.813569 171.786706 8.213370
 	S 0 0.000000 10.337431 0.695568 13.312500 1.125000
 	END
-TURNOUT On2½ "Fast Tracks	#7 Right On30	TT-On30-T-7R"
+TURNOUT On30 "Fast Tracks	#7 Right On30	TT-On30-T-7R"
 	U "Regular Turnout" "" "Fast Tracks" "#7 Left On30" "TT-On30-T-7L" "#7 Right On30" "TT-On30-T-7R" 13.312500 8.213218 1.125000 13.312500 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -151,7 +151,7 @@ TURNOUT On2½ "Fast Tracks	#7 Right On30	TT-On30-T-7R"
 	C 0 0.000000 67.813569 0.649330 -67.813569 0.000076 8.213370
 	S 0 0.000000 10.337431 -0.695568 13.312500 -1.125000
 	END
-TURNOUT On2½ "Fast Tracks	#8 Left On30	TT-On30-T-8L"
+TURNOUT On30 "Fast Tracks	#8 Left On30	TT-On30-T-8L"
 	U "Regular Turnout" "" "Fast Tracks" "#8 Left On30" "TT-On30-T-8L" "#8 Right On30" "TT-On30-T-8R" 15.875000 7.180762 1.250000 15.875000 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -163,7 +163,7 @@ TURNOUT On2½ "Fast Tracks	#8 Left On30	TT-On30-T-8L"
 	C 0 0.000000 -84.531218 0.649712 84.531218 172.819162 7.180914
 	S 0 0.000000 11.216225 0.663028 15.875000 1.250000
 	END
-TURNOUT On2½ "Fast Tracks	#8 Right On30	TT-On30-T-8R"
+TURNOUT On30 "Fast Tracks	#8 Right On30	TT-On30-T-8R"
 	U "Regular Turnout" "" "Fast Tracks" "#8 Left On30" "TT-On30-T-8L" "#8 Right On30" "TT-On30-T-8R" 15.875000 7.180762 1.250000 15.875000 0.000000 0.031250 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4