pacing, new/redundant ops keys

JMRI · Dec 21, 2018 · 8844f84 · 8844f84
1 parent 5301b45
commit 8844f84
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_de.properties b/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_de.properties
@@ -100,3 +100,7 @@ Delivery=Zustellung
 Drop=Zustell
 Restrictions=Beschr\u00e4nkungen
 Schedules=Ablaufplane
+AcceptAll=Alles durchf\u00fchren
+AcceptOnly=Nur durchf\u00fchren f\u00fcr
+ShipAll=Alles versenden
+ShipOnly=Nur versenden von
diff --git a/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_fr.properties b/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_fr.properties
@@ -1,8 +1,6 @@
 # JmritOperationsLocationsBundle_fr.properties
 #
-# Revision $Revision$
-#
-# Default properties for the jmri.jmrit.operations.locations
+# French properties for the jmri.jmrit.operations.locations
 #
 # Updated by BLOREC Herv\u00e9 <bzh56420@yahoo.fr> 2016-06-07
 
@@ -97,7 +95,6 @@ Staging         = Coulisse
 StagingOnly     = Coulisse seulement
 Class/Interchange   = C/E
 Number          = Num
-Yes             = Oui
 AbbreviationSetOut	= SO
 AbbreviationPickUp	= PU
 AddLocation     = Ajouter un Emplacement
@@ -235,19 +232,20 @@ SpurTrackThatAccept = Voies Embranch\u00e9es qui acceptent le type de wagon {0}:
 YardTrackThatAccept          = Voies de triage qui acceptent le type de wagon {0}:
 InterchangesThatAccept       = Voies Classification/Echange qui acceptent le type de wagon {0}:
 StageTrackThatAccept         = Voies en coulisse qui acceptent le type de wagon {0}:
+# the following overrides gender in this application for French
 None                         = Aucun
 LocationTrackLength          = {0}, {1} {2} Longueur
 TotalLengthSpur     = Longueur totale des embranchements qui acceptent le type de wagon {0} {1} {2} pourcentage utilis\u00e9 {3}%
 TotalLengthYard              = Longueur totale des triages qui acceptent le type de wagon {0} {1} {2} pourcentage utilis\u00e9 {3}%
 TotalLengthInterchange       = Longueur totale des \u00e9changes qui acceptent le type de wagon {0} {1} {2} pourcentage utilis\u00e9 {3}%
 TotalLengthStage             = Longueur totale des coulisses qui acceptent le type de wagon {0} {1} {2} pourcentage utilis\u00e9 {3}%
-Printoptions    = Options d'impression
+
 PrintLocations  = Imprimer Emplacements
 PrintSchedules  = Imprimer Horaires 
 PrintDetails    = Imprimer D\u00e9tails de l'Emplacement
 PrintAnalysis   = Imprimer Analyse Voie 
 PrintComments   = Imprimer les Commentaires
-ButtonOkay = OK
+
 # Annexe
 Schedules        = Planning
 DeliverySchedule = plannings Facultatifs
@@ -267,14 +265,11 @@ AddSchedule      = Ajouter Horaire
 DeleteSchedule   = Supprimer l'horaire
 SaveSchedule     = Sauver l'horaire
 AddType          = Ajouter un type de wagon
-Up               = Haut
-Down             = Bas
 NotValid         = Non Valide <{0}>
 ReportExists     = Un Planning avec ce nom existe d\u00e9j\u00e0
 CanNotSchedule   = Impossible de {0} horaire!
 empty            = Erreur <vide>
 ScheduleNameLengthMax   = Nom Planning doit \u00eatre inf\u00e9rieur \u00e0 {0} caract\u00e8res
-Status                  = \u00c9tat
 StatusSpur              = \u00c9tat Embranchement
 SwapCarLoads            = \u00c9change par d\u00e9faut de charge et de vide
 EmptyDefaultCarLoads    = Wagon vide avec des charges par d\u00e9faut
@@ -316,7 +311,7 @@ TipIgnoresAlternate     = Cette option ignore l'annexe de la voie alternative
 TipTrackNotThisType     = La voie ne dessert pas le wagon type{0}
 
 # Changement type de voie
-Tracktype   = S\u00e9lectionner le Type de Voie D\u00e9sir\u00e9e pour {0}
+TrackType   = S\u00e9lectionner le Type de Voie D\u00e9sir\u00e9e pour {0}
 Spur        = Embranchement
 Yard        = Triage
 

diff --git a/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_it.properties b/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_it.properties
@@ -332,7 +332,6 @@ PrePlanedPickups = Percentuale di materiale rotabile prevista per il ritiro
 # status messages when placing rolling stock
 okay = ok
 rollingStock    = Carro
-length = lunghezza
 type = tipo
 schedule = pianificazione
 load = carico

diff --git a/java/test/apps/gui3/paned/PanelProFrameTest.java b/java/test/apps/gui3/paned/PanelProFrameTest.java
@@ -18,7 +18,7 @@ public class PanelProFrameTest {
     public void testCTor() {
         Assume.assumeFalse(GraphicsEnvironment.isHeadless());
         PanelProFrame t = new PanelProFrame("test");
-        Assert.assertNotNull("exists",t);
+        Assert.assertNotNull("exists", t);
         t.dispose();
     }
 
@@ -28,7 +28,7 @@ public void setUp() {
         JUnitUtil.setUp();
         JUnitUtil.resetProfileManager();
 
-        // The class under test uses two loconet connections it pulls from the InstanceManager.
+        // The class under test uses two LocoNet connections it pulls from the InstanceManager.
         jmri.jmrix.loconet.LocoNetSystemConnectionMemo memo = new jmri.jmrix.loconet.LocoNetSystemConnectionMemo();
         jmri.jmrix.loconet.LocoNetInterfaceScaffold lnis = new jmri.jmrix.loconet.LocoNetInterfaceScaffold(memo);
         memo.setLnTrafficController(lnis);