Update upstream source from tag 'upstream/5.3.0GA'

Update to upstream version '5.3.0GA'
with Debian dir dfd14d63b0238e276ade6f54dd9100325df5b2f9

1 files changed, 93 insertions, 11 deletions

diff --git a/app/help/messages.in b/app/help/messages.in
index 8834dcb..b4c4559 100644
--- a/app/help/messages.in
+++ b/app/help/messages.in
@@ -159,11 +159,19 @@ The current \f{Layer} is where most new objects are created. It's not possible t
 Refer to \k{cmdLayer} for detail.
 END
 
+# cgroup.c:GroupOk
+MESSAGE MSG_GROUP_NO_PATHS
+No Paths were detected when grouping selected Tracks.
+HELP
+Please contact development
+END
+
 # cgroup.c:doGroup
 MESSAGE MSG_CANT_GROUP_BUMPER1
 Cannot Group Bumper Track. The track has been unselected.
 HELP
 Bumper tracks (tracks with 1 endpoint) are not supported by the Group command.
+Convert the Bumper track to a Straight track by Ungrouping \k{cmdUngroup} it first.
 END
 
 # cgroup.c:doGroup
@@ -288,11 +296,11 @@ END
 
 # track.c
 MESSAGE MSG_CANT_SPLIT_TRK
-Cannot split %s track
+Cannot split track of type %s
 ALT
 Cannot split TYPE track
 HELP
-This type of track cannot be \f{Split}. Only Straight, Curved, Circle and Easement tracks can be \f{Split}. To \f{Split} a Turnout, hold down the Shift key then \e{Left-Click} on the position where the track should be \f{Split}.
+This fixed track like turnouts or or other sectional track cannot be \f{Split}. Only flexible, Cornu, straight and curved tracks can be \f{Split}. To \f{Split} a Turnout, hold down the Shift key then \e{Left-Click} on the position where the track should be \f{Split}.
 
 Refer to \k{cmdSplitTrack} for detail.
 END
@@ -863,6 +871,26 @@ The specified command has been disabled in error.
 Please report this error to the \e{XTrackCAD} project development team at SourceForge. The process for reporting errors is outlined in \k{bugs}.
 END
 
+# cturnout.c:CheckPaths
+MESSAGE MSG_SEGMENT_NOT_ON_PATH
+Track segment %d not on any Path for %s
+ALT
+Track segment N not on Path for Turnout
+HELP
+A Path (a sequence of track segments) defines a route through a Turnout from one End Point to another.
+Each segment should be be present in a least one Path.
+
+This can happen when Grouping complex track objects, or when there is more than one path between End Points, for example a siding.
+
+Try simplifying the segments or removing any loops in the connected segments.
+
+This message can be suppressed by passing the command line option 
+
+\b /d suppresscheckpaths (Windows) or
+
+\b -d suppresscheckpaths (Linux/MAC)
+END
+
 # cturnout.c:splitTurnout
 MESSAGE MSG_SPLIT_POS_BTW_MERGEPTS
 Split position between Turnout Points
@@ -970,6 +998,12 @@ The current command operates on the unconnected \e{endpoint} of a track, but the
 Refer to \k{cmdSplitTrack} for detail.
 END
 
+MESSAGE MSG_SPLITTED_OBJECT_TOO_SHORT
+The resulting length of one track piece is shorter than the minimum length of %d.
+HELP
+After the split one of the track segments will be shorter than the minimum length. Select a different position for splitting.
+END
+
 # cpull.c
 MESSAGE MSG_PULL_FEW_SECTIONS
 There are too few sections in this loop.
@@ -999,11 +1033,20 @@ END
 
 # cgroup.c:groupOk
 MESSAGE MSG_TOOMANYSEGSINGROUP
-Too many segments in Group.
+Too many track segments in Group.
 HELP
-A group is limited to a maximum of 128 track segments. The number of segments within the selected group of tracks exceed this number. Select a smaller number of tracks then try again.
+A group is limited to a maximum of 127 track segments. The number of track segments within the selected group of tracks exceed this number. Select a smaller number of tracks then try again.
 
-Refer to \k{cmdGroup} for detail.
+Refer to \k{cmdGroup} for details.
+END
+
+# cgroup.c:groupOk
+MESSAGE MSG_TOOMANYSEGSINGROUP2
+Track segments appear too late in Group segment list.
+HELP
+A Group's track segments must be in the first 127 segments.  You can move the track segments to the start of the segment list.
+
+Refer to \k{cmdGroup} for details.
 END
 
 # cmodify.c
@@ -1151,7 +1194,7 @@ END
 
 # various
 MESSAGE MSG_CARINV_DELETE_CONFIRM
-Are you sure you want to delete these %d car(s)?
+Are you sure you want to delete these %d car(s) from your inventory?
 #NOHELP
 END
 
@@ -1525,15 +1568,54 @@ END
 
 # misc2.c
 MESSAGE MSG_BAD_SCALE_INDEX
-Scale index (%d) is not valid
-#NOHELP
+Scale index (%d) is not valid.
+Do you want use the current layout scale (%s)?
+Or create an "Unknown" scale?
+See 'Help|Recent Messages' for details.
+ALT
+Scale index (NNN) is not valid.
+Do you want use the current layout scale (SCALE)?
+Or create an "Unknown" scale?
+See 'Help|Recent Messages' for details.
+HELP
+Internal error: an invalid scale index has been generated.
+You can substitute the layout's current scale (recommended).
+
+If you do not want to use the currrent scale:
+
+\b Choose "Unknown".
+
+\b Save your file
+
+\b Choose the correct scale from 'Options|Layout'
+
+\b Reload your file
+
+\b You will see a notice that "Scale Unknown is invalid"
+
+\b Choose the layout scale
+
+You can also correct this by selecting the affected tracks, and using the 'Change|Change Scale' \k{cmdRescale} command.
+
+Please report this error to the \e{XTrackCAD} project development team at SourceForge. The process for reporting errors is outlined in \k{bugs}.
 END
 
 # misc2.c
 MESSAGE MSG_BAD_SCALE_NAME
-Scale %s is not valid
-Please check your %s.xtq file
-#NOHELP
+Scale "%s" is not valid.  We will substitute a dummy scale based on "%s".
+See 'Help|Recent Messages' for details.
+ALT
+Scale "SCALE1" is not valid.  We will substitute a dummy scale based on "SCALE2".
+See 'Help|Recent Messages' for details.
+HELP
+SCALE1 is not one of known scales defined in "xtrkcad.xtq".
+We will substitute the layout scale info from SCALE2.
+
+If the current scale is not correct, then select it on 'Options|Layout' and reload your layout.
+
+You can also correct this by selecting the affected tracks, and using the 'Change|Change Scale' \k{cmdRescale} command.
+
+Please report this error to the \e{XTrackCAD} project development team at SourceForge. The process for reporting errors is outlined in \k{bugs}.
 END