New upstream version 5.1.0upstream/5.1.0

1 files changed, 38 insertions, 2 deletions

diff --git a/app/help/messages.in b/app/help/messages.in
index 3fe1b97..519f2f8 100644
--- a/app/help/messages.in
+++ b/app/help/messages.in
@@ -73,7 +73,7 @@ Refer to \k{cmdTurnoutNew} for detail.
 END
 
 MESSAGE MSG_CURVE_OUT_OF_RANGE
-Angle must be between 0° and 360°.
+Angle must be between 0\u00B0 and 360\u00B0.
 HELP
 The angle specified for a curve must be between 0\u00B0 and 360\u00B0.
 END
@@ -189,6 +189,15 @@ You cannot select a \f{Turntable} as the second track in \f{Join} command. If yo
 Refer to \k{cmdJoin} for detail.
 END
 
+ ccornu.c
+MESSAGE MSG_JOIN_CORNU_SAME
+Cannot Join; Selected endpoints are on same track.
+HELP
+You are trying to \f{Join} a section of track with itself. Different tracks must selected when using the \f{Join} command.
+
+Refer to \k{cmdJoin} for detail.
+END
+
 # cjoin.c
 MESSAGE MSG_JOIN_SAME
 Cannot Join; Selected endpoints are on same track.
@@ -272,6 +281,14 @@ The parameters \e{Minimum Track Length}, \e{Connection Angle} and \e{Connection
 Refer to \k{cmdPref} for detail.
 END
 
+MESSAGE MSG_CONN_PARAMS_TOO_BIG
+Connection parameters reset to maximum values.
+HELP
+The parameters \e{Minimum Track Length}, \e{Connection Angle} and \e{Connection Distance} have maximum values that cannot be set to bigger values. The maximum values are 1.0"/2.54cm, 10\u00B0 and 1.0"/2.54cm respectively.
+
+Refer to \k{cmdPref} for detail.
+END
+
 # fileio.c
 MESSAGE MSG_CANT_PASTE
 Copy/Paste buffer is empty. There is nothing to Paste.
@@ -622,8 +639,20 @@ HELP
 It's not possible to create a Circle or Helix with a radius of 0\u00B0 or less. Specify a positive value in the \f{Radius} field that appears in the Status Bar.
 END
 
+MESSAGE MSG_RADIUS_GTR_10000 
+Radius must be less than 10000.
+HELP
+It's not possible to create a Circle or Helix with a radius of 10000\u00B0 or more. Specify a smaller value in the \f{Radius} field.
+END
+
+MESSAGE MSG_RADIUS_TOO_BIG 
+The Circle or Helix will not fit within the layouts room parameters (Height and Width).
+HELP
+The defined circle can not fit within the defined layout parameters. Either specify a smaller value in the \f{Radius} field, or increase the room parameters in the \f{Layout} dialog.
+END
+
 #cselect.c
-MESSAGE MSG_RESCALE_TOO_BIG
+MESSAGE MSG_RESCALE_TOO_BIG 
 Rescaled tracks do not fit within layouts room parameters
 (Height and width). The layouts room parameters should be
 set to at least %s by %s.
@@ -940,6 +969,13 @@ A critical file is corrupt. Unfortunately it will be necessary to reinstall the
 Please report this error to the \e{XTrackCAD} project development team at SourceForge. The process for reporting errors is outlined in \k{bugs}.
 END
 
+# param.c
+MESSAGE MSG_ENTERED_STRING_TRUNCATED
+The entered text is too long. Maximum length is %d. 
+HELP
+The text entered into a field is longer than the maximum allowed length and was truncated. Please check the shortened text and edit as necessary.
+END
+
 # track.c
 MESSAGE MSG_PT_IS_NOT_TRK
 [%s %s] is not a track.