Merge remote-tracking branch 'refs/remotes/JMRI/master'

help/en/package/jmri/jmrit/operations/Operations.shtml

@@ -2553,15 +2553,6 @@
     certain car type, and that car type is departing staging, and the car's load is default empty,
     the program will place the custom load into that car if one of the two options is selected.</p>
 
-   <p>
-    To restrict which loads the program will place into your cars, you can use the staging track's
-    load control features. Under the "Tools" menu in the "Edit Track" window find <a
-     href="#LoadOptions">Load Options</a>. You can also control which types of loads the program
-    will place by restricting the types of loads the train departing from staging is allowed to
-    service. To control which loads a train will service, select under the "Edit Train" window menu
-    "Tools" then <a href="#TrainLoadOptions">Train Load Options</a>.
-   </p>
-
    <p>The third option "Generate custom loads for any staging track" will try and place custom
     loads into your empty cars by searching for destinations that are staging tracks. The program
     will randomly search for a staging track that isn't located at the train's departure location.
@@ -2572,11 +2563,18 @@
     to placing the custom load in the car, set the car's final destination to the location where the
     staging track resides.</p>
 
-   <p>To control which loads the program will generate for you when departing staging, use the
-    "Load Options" under "Tools" in the "Edit Staging Track" window, and adjust the "Select loads
-    shipped from this track" to your liking. You can also control which loads your staging tracks
-    will accept. Again use the "Load Options" for a staging track, and adjust the "Select loads
-    serviced by this track" to control which car loads are allowed into staging.</p>
+   <p>
+    To restrict which car loads the program will generate for you when departing staging, use the <a href="#LoadOptions">Load
+     Options</a> under "Tools" in the "Edit Staging Track" window, and adjust the "Select loads shipped from this track" to
+    your liking. You can also control which types of loads the program will place in your cars by restricting the types
+    of loads the train departing from staging is allowed to service. To control which loads a train will service, select
+    under the "Edit Train" window menu "Tools" then <a href="#TrainLoadOptions">Train Load Options</a>.
+
+   <p>
+    You can also control which loads your staging tracks will accept. Again use the <a href="#LoadOptions">Load
+     Options</a> for a staging track, and adjust the "Select loads serviced by this track" to control which car loads are
+    allowed into staging.
+   </p>
 
    <p>
     You can control which destinations are valid out of staging by using the <a

java/src/jmri/jmrit/operations/trains/JmritOperationsTrainsBundle.properties

@@ -834,8 +834,8 @@ buildSearchTrackLoadStaging = Generate load for ({0}) type ({1}) load ({2}) at (
 buildTrainNotNewLoad        = Train ({0}) doesn''t service load ({1}) destination ({2}, {3})
 buildTrackNotNewLoad        = Departure track ({0}) can''t ship load ({1}) to destination ({2}, {3})
 buildTrackNotLoadSchedule   = Departure track ({0}) can''t ship load ({1}) to destination ({2}, {3}) schedule id ({4})
-buildScheduleNotActive      = Track ({0}) schedule id ({1}) timetable ({2}) not active for ({3})
-buildScheduleRandom         = Track ({0}) schedule ({1}) id ({2}) random value {3} is less than generated {4}
+buildScheduleNotActive      = Spur ({0}) schedule id ({1}) timetable ({2}) not active for ({3})
+buildScheduleRandom         = Spur ({0}, {1}) schedule ({2}) id ({3}) load ({4}) random value {5} is less than generated {6}, skipping this line item
 buildNoDestTrackNewLoad     = Destination ({0}, {1}) can''t service car ({2}) with load ({3}) due to {4}
 BuildDestTrackNoLoad        = Destination ({0}, {1}) will not accept car ({2}) with load ({3})
 buildTrySpurLoad            = Try spur ({0}, {1}) custom load ({2})

java/src/jmri/jmrit/operations/trains/JmritOperationsTrainsBundle_da.properties

@@ -797,8 +797,8 @@ buildSearchTrackLoadStaging = Generate load for ({0}) type ({1}) load ({2}) at (
 buildTrainNotNewLoad        = Train ({0}) doesn''t service load ({1}) destination ({2}, {3})
 buildTrackNotNewLoad        = Departure track ({0}) can''t ship load ({1}) to destination ({2}, {3})
 buildTrackNotLoadSchedule   = Departure track ({0}) can''t ship load ({1}) to destination ({2}, {3}) schedule id ({4})
-buildScheduleNotActive      = Track ({0}) schedule id ({1}) timetable ({2}) not active for ({3})
-buildScheduleRandom         = Track ({0}) schedule ({1}) id ({2}) random value {3} is less than generated {4}
+buildScheduleNotActive      = Spur ({0}) schedule id ({1}) timetable ({2}) not active for ({3})
+buildScheduleRandom         = Spur ({0}, {1}) schedule ({2}) id ({3}) load ({4}) random value {5} is less than generated {6}, skipping this line item
 buildNoDestTrackNewLoad     = Destination ({0}, {1}) can''t service car ({2}) with load ({3}) due to {4}
 BuildDestTrackNoLoad        = Destination ({0}, {1}) will not accept car ({2}) with load ({3})
 buildTrySpurLoad            = Try spur ({0}, {1}) custom load ({2})

java/src/jmri/jmrit/operations/trains/JmritOperationsTrainsBundle_de.properties

@@ -814,8 +814,8 @@ buildSearchTrackLoadStaging = Generate load for ({0}) type ({1}) load ({2}) at (
 buildTrainNotNewLoad        = Train ({0}) doesn''t service load ({1}) destination ({2}, {3})
 buildTrackNotNewLoad        = Departure track ({0}) can''t ship load ({1}) to destination ({2}, {3})
 buildTrackNotLoadSchedule   = Departure track ({0}) can''t ship load ({1}) to destination ({2}, {3}) schedule id ({4})
-buildScheduleNotActive      = Track ({0}) schedule id ({1}) timetable ({2}) not active for ({3})
-buildScheduleRandom         = Track ({0}) schedule ({1}) id ({2}) random value {3} is less than generated {4}
+buildScheduleNotActive      = Spur ({0}) schedule id ({1}) timetable ({2}) not active for ({3})
+buildScheduleRandom         = Spur ({0}, {1}) schedule ({2}) id ({3}) load ({4}) random value {5} is less than generated {6}, skipping this line item
 buildNoDestTrackNewLoad     = Destination ({0}, {1}) can''t service car ({2}) with load ({3}) due to {4}
 BuildDestTrackNoLoad        = Destination ({0}, {1}) will not accept car ({2}) with load ({3})
 buildTrySpurLoad            = Try spur ({0}, {1}) custom load ({2})

java/src/jmri/jmrit/operations/trains/JmritOperationsTrainsBundle_fr.properties

@@ -838,7 +838,7 @@ buildTrainNotNewLoad        = Train ({0}) ne peut pas acheminer la charge ({1})
 buildTrackNotNewLoad        = Voie de d\u00e9part ({0}) Impossible d'exp\u00e9dier la charge ({1}) \u00e0 destination ({2}, {3})
 buildTrackNotLoadSchedule   = Voie de d\u00e9part ({0}) Impossible d'exp\u00e9dier la charge ({1}) \u00e0 destination ({2}, {3}) annexe id ({4})
 buildScheduleNotActive      = La voie ({0}) annexe id ({1}) horaire ({2}) n'est pas active pour ({3})
-buildScheduleRandom         = Voie ({0}) planning ({1}) id ({2}) valeur al\u00e9atoire {3} est inf\u00e9rieure \u00e0 celle g\u00e9n\u00e9r\u00e9e {4}
+buildScheduleRandom         = Voie ({0}, {1}) planning ({2}) id ({3}) valeur al\u00e9atoire {5} est inf\u00e9rieure \u00e0 celle g\u00e9n\u00e9r\u00e9e {6}
 buildNoDestTrackNewLoad     = Destination ({0}, {1}) Impossible d'acheminer le wagon ({2}) avec une charge ({3}) en raison de {4}
 BuildDestTrackNoLoad        = Destination ({0}, {1}) n'acceptera pas de wagon ({2}) avec une charge ({3})
 buildTrySpurLoad        = Essayez l'embranchement ({0}, {1}) Charge ({2}) 

java/src/jmri/jmrit/operations/trains/TrainBuilder.java

@@ -3856,7 +3856,7 @@ private ScheduleItem checkScheduleItem(ScheduleItem si, Car car, Track track) {
                 log.debug("Selected random {}, created random {}", si.getRandom(), random);
                 if (random > value) {
                     addLine(_buildReport, SEVEN, MessageFormat.format(Bundle.getMessage("buildScheduleRandom"),
-                            new Object[]{track.getName(), track.getScheduleName(), si.getId(), value, random}));
+                            new Object[]{track.getLocation().getName(), track.getName(), track.getScheduleName(), si.getId(), si.getReceiveLoadName(), value, random}));
                     return null;
                 }
             } catch (NumberFormatException e) {