CTC Tool submenus w/ellipsis

JMRI · May 5, 2019 · 2768e57 · 2768e57
1 parent 84867a6
commit 2768e57
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 34 deletions.
diff --git a/java/src/jmri/jmrit/ToolsMenu.java b/java/src/jmri/jmrit/ToolsMenu.java
@@ -109,8 +109,8 @@ public ToolsMenu() {
         add(new jmri.jmrit.powerpanel.PowerPanelAction(Bundle.getMessage("MenuItemPowerControl")));
         add(new jmri.jmrit.simpleturnoutctrl.SimpleTurnoutCtrlAction(Bundle.getMessage("MenuItemTurnoutControl")));
         add(new jmri.jmrit.simplelightctrl.SimpleLightCtrlAction(Bundle.getMessage("MenuItemLightControl")));
-        add(new jmri.jmrit.blockboss.BlockBossAction(Bundle.getMessage("MenuItemSimpleSignal")));
         add(new jmri.jmrit.sensorgroup.SensorGroupAction(Bundle.getMessage("MenuItemSensorGroup")));
+        add(new jmri.jmrit.blockboss.BlockBossAction(Bundle.getMessage("MenuItemSimpleSignal")));
         add(new jmri.jmrit.speedometer.SpeedometerAction(Bundle.getMessage("MenuItemSpeedometer")));
         add(new jmri.jmrit.ampmeter.AmpMeterAction(Bundle.getMessage("MenuItemAmpMeter")));
         add(new jmri.jmrit.sendpacket.SendPacketAction(Bundle.getMessage("MenuItemSendDCCPacket")));
@@ -131,7 +131,7 @@ public ToolsMenu() {
         add(new jmri.jmrit.cabsignals.CabSignalAction());
 
         add(new JSeparator());
-        // add start web server menu item
+        // add start web server menu item (immediate action)
         add(new jmri.web.server.WebServerAction());
     }
 

diff --git a/java/src/jmri/jmrit/ussctc/UssCtcBundle.properties b/java/src/jmri/jmrit/ussctc/UssCtcBundle.properties
@@ -4,8 +4,8 @@
 
 MenuCtcTools    = USS CTC Tools
 
-MenuItemOsIndicator =  OS Indicators
-MenuItemFollower    =  Followers
+MenuItemOsIndicator =  OS Indicators...
+MenuItemFollower    =  Followers...
 
 TitleOsIndicator    = Define OS Indicator
 TitleFollower       = Define Follower
@@ -32,5 +32,5 @@ ErrorNoTurnoutMatch = Turnout named \"{0}\" doesn''t exist and can''t be created
 ErrorNoSensorMatch  = Sensor named \"{0}\" doesn''t exist and can''t be created.\nPlease correct the entry or create a sensor \nby that name using the Sensor Table.
 ErrorNoMemoryMatch  = Memory named \"{0}\" doesn''t exist and can''t be created.\nPlease correct the entry or create a memory \nby that name using the Memory Table.
 
-# title for error dialog boxen
+# title for error dialog boxes
 ErrorTitle = Validation Error
diff --git a/java/src/jmri/jmrit/ussctc/UssCtcBundle_ca.properties b/java/src/jmri/jmrit/ussctc/UssCtcBundle_ca.properties
@@ -2,12 +2,12 @@
 #
 # Catalan properties for the jmri.jmrit.ussctc Tools menu
 # Translation Joan de Castro (joan276dca@yahoo.es) 18/08/2016
-# Catalan Translation Luis Zamora (eldelinux) <eldelinux@yahoo.es> 2018/06/19
+# Translation Luis Zamora (eldelinux) <eldelinux@yahoo.es> 2018/06/19
 
 MenuCtcTools    = Eines USS CTC
 
-MenuItemOsIndicator =  Indicadors OS
-MenuItemFollower    =  Seguidors
+MenuItemOsIndicator =  Indicadors OS...
+MenuItemFollower    =  Seguidors...
 
 TitleOsIndicator    = Defineix Indicador OS
 TitleFollower       = Defineix Seguidors
@@ -34,5 +34,5 @@ ErrorNoTurnoutMatch = L'Agulla anomenada \"{0}\" no existeix i no es pot crear.\
 ErrorNoSensorMatch  = El Sensor anomenat \"{0}\" no existeix i no es pot crear.\nSi us plau corregeix les dades o crea un Sensor\namb aquest nom usant la Taula de Sensors.
 ErrorNoMemoryMatch  = La mem\u00f2ria anomenada \"{0}\" no existeix i no es pot crear.\nSi us plau corregeix les dades o crea una Mem\u00f2ria\namb aquest nom usant la Taula de Mem\u00f2ria.
 
-# title for error dialog boxen
+# title for error dialog boxes
 ErrorTitle = Error de Validaci\u00f3
diff --git a/java/src/jmri/jmrit/ussctc/UssCtcBundle_da.properties b/java/src/jmri/jmrit/ussctc/UssCtcBundle_da.properties
@@ -4,8 +4,8 @@
 
 MenuCtcTools    = USS CTC Tools
 
-MenuItemOsIndicator =  OS Indicators
-MenuItemFollower    =  Followers
+MenuItemOsIndicator =  OS Indicators...
+MenuItemFollower    =  Followers...
 
 TitleOsIndicator    = Define OS Indicator
 TitleFollower       = Define Follower
@@ -32,5 +32,5 @@ ErrorNoTurnoutMatch = Turnout named \"{0}\" doesn''t exist and can''t be created
 ErrorNoSensorMatch  = Sensor named \"{0}\" doesn''t exist and can''t be created.\nPlease correct the entry or create a sensor \nby that name using the Sensor Table.
 ErrorNoMemoryMatch  = Memory named \"{0}\" doesn''t exist and can''t be created.\nPlease correct the entry or create a memory \nby that name using the Memory Table.
 
-# title for error dialog boxen
+# title for error dialog boxes
 ErrorTitle = Validation Error
diff --git a/java/src/jmri/jmrit/ussctc/UssCtcBundle_de.properties b/java/src/jmri/jmrit/ussctc/UssCtcBundle_de.properties
@@ -1,12 +1,12 @@
 # UssCtcBundle_de.properties
 #
-# by Simon Ginsburg und Egbert Broerse
 # German properties for the jmri.jmrit.ussctc Tools menu
+# by Simon Ginsburg und Egbert Broerse
 
 MenuCtcTools = USS CTC Werkzeuge
 
-MenuItemOsIndicator = OS Indikatoren
-MenuItemFollower = Folgeabschnitte
+MenuItemOsIndicator = OS Indikatoren...
+MenuItemFollower = Folgeabschnitte...
 
 TitleOsIndicator = Beschreibe OS Indikator
 TitleFollower = Beschreibe Folgeabschnitt
@@ -33,5 +33,5 @@ ErrorNoTurnoutMatch = Die Weiche mit dem Namen \"{0}\" existiert nicht und kann
 ErrorNoSensorMatch = Der Sensor mit dem Namen \"{0}\" existiert nicht und kann nicht erzeugt werden.\nNamen korrigieren oder Erzeugen eines Sensors mit diesem Namen in der Sensorentabelle.
 ErrorNoMemoryMatch = Der Speicher mit dem Namen \"{0}\" existiert nicht und kann nicht erzeugt werden.\nNamen korrigieren oder Erzeugen eines Speichers mit diesem Namen in der Speichertabelle.
 
-# title for error dialog boxen
+# title for error dialog boxes
 ErrorTitle = Validierungsfehler
diff --git a/java/src/jmri/jmrit/ussctc/UssCtcBundle_es.properties b/java/src/jmri/jmrit/ussctc/UssCtcBundle_es.properties
@@ -4,8 +4,8 @@
 
 MenuCtcTools = Herramientas USS CTC
 
-MenuItemOsIndicator = Indicadores OS
-MenuItemFollower = Siguientes
+MenuItemOsIndicator = Indicadores OS...
+MenuItemFollower = Siguientes...
 
 TitleOsIndicator = Definir indicador OS
 TitleFollower = Definir siguiente
@@ -32,5 +32,5 @@ ErrorNoTurnoutMatch = El desv\u00edo \"{0}\" no existe y no se puede crear.\nPor
 ErrorNoSensorMatch = El sensor \"{0}\" no existe y no se puede crear.\nPor favor, corrija la entrada o cree un\nsensor con ese nombre en la tabla de sensores.
 ErrorNoMemoryMatch = La memoria \"{0}\" no existe y no se puede crear.\nPor favor, corrija la entrada o cree una\nmemoria con ese nombre usando la tabla de memoria.
 
-# title for error dialog boxen
+# title for error dialog boxes
 ErrorTitle = Error de validaci\u00f3n
diff --git a/java/src/jmri/jmrit/ussctc/UssCtcBundle_fr.properties b/java/src/jmri/jmrit/ussctc/UssCtcBundle_fr.properties
@@ -1,13 +1,12 @@
 # UssCtcBundle_fr.properties
 #
-# Franch properties for the jmri.jmrit.ussctc Tools menu
-#
+# French properties for the jmri.jmrit.ussctc Tools menu
 # Translated by Herv\u00e9 BLOREC <bzh56420@yahoo.fr> le 2013-8-21
 
 MenuCtcTools = Outils USS CTC
 
-MenuItemOsIndicator =Indicateurs OS
-MenuItemFollower = Suiveurs
+MenuItemOsIndicator = Indicateurs OS...
+MenuItemFollower = Suiveurs...
 
 TitleOsIndicator = D\u00e9finir Indicateur OS 
 TitleFollower = D\u00e9finir Follower
@@ -34,5 +33,5 @@ ErrorNoTurnoutMatch = L'Aiguillage nomm\u00e9\"{0}\" n'existe pas et ne peut pas
 ErrorNoSensorMatch = Le Capteur nomm\u00e9\"{0}\ n'existe pas et ne peut pas \u00eatre cr\u00e9\u00e9.\nVeuillez corriger l'entr\u00e9e ou cr\u00e9er un Capteur\navec ce nom en utilisant le Tableau Capteur.
 ErrorNoMemoryMatch = La M\u00e9moire nomm\u00e9\"{0}\"n'existe pas et ne peut pas \u00eatre cr\u00e9\u00e9.\NVeuillez corriger l'entr\u00e9e ou cr\u00e9er une m\u00e9moire\navec ce nom en utilisant le Tableau M\u00e9moire.
 
-# Titre pour boxen de dialogue d'erreur
+# Titre pour paneaux de dialogue d'erreur
 ErrorTitle = Erreur de validation
diff --git a/java/src/jmri/jmrit/ussctc/UssCtcBundle_it.properties b/java/src/jmri/jmrit/ussctc/UssCtcBundle_it.properties
@@ -1,13 +1,12 @@
 # UssCtcBundle_it.properties
 #
-# Italian translation: Enzo Fortuna (babbo_enzo@yahoo.com )
-#
-# Default properties for the jmri.jmrit.ussctc Tools menu
+# Italian properties for the jmri.jmrit.ussctc Tools menu
+# Translation: Enzo Fortuna (babbo_enzo@yahoo.com )
 
 MenuCtcTools    = Strumenti USS CTC
 
-MenuItemOsIndicator =  Indicatori OS
-MenuItemFollower    =  Followers
+MenuItemOsIndicator =  Indicatori OS...
+MenuItemFollower    =  Followers...
 
 TitleOsIndicator    = Definisci Indicatore OS
 TitleFollower       = Definisci Follower
@@ -34,5 +33,5 @@ ErrorNoTurnoutMatch = Scambio \"{0}\" non esiste e non pu\u00f2 essere creato.\n
 ErrorNoSensorMatch  = Sensore \"{0}\" non esiste e non pu\u00f2 essere creato.\nCorreggi i dati o crea un Sensore \ncon questo nome usando la Tabella Sensori.
 ErrorNoMemoryMatch  = Memoria \"{0}\" non esiste e non pu\u00f2 essere creata.\nCorreggi i dati o crea una memoria \ncon questo nome usando la Tabella Memoria.
 
-# title for error dialog boxen
+# title for error dialog boxes
 ErrorTitle = Errore Convalida
diff --git a/java/src/jmri/jmrit/ussctc/UssCtcBundle_ja_JP.properties b/java/src/jmri/jmrit/ussctc/UssCtcBundle_ja_JP.properties
@@ -1,12 +1,12 @@
-# UssCtcBundle.properties
+# UssCtcBundle_ja_JP.properties
 #
 # Japanese properties for the jmri.jmrit.ussctc Tools menu
 # Translated by Sakae Akanuma <sakaeakanuma@gmail.com>
 
 MenuCtcTools    = USS CTC\u30c4\u30fc\u30eb
 
-MenuItemOsIndicator =  OS\u30a4\u30f3\u30b8\u30b1\u30fc\u30bf\u30fc
-MenuItemFollower    =  \u30d5\u30a9\u30ed\u30ef\u30fc
+MenuItemOsIndicator =  OS\u30a4\u30f3\u30b8\u30b1\u30fc\u30bf\u30fc...
+MenuItemFollower    =  \u30d5\u30a9\u30ed\u30ef\u30fc...
 
 TitleOsIndicator    = OS\u30a4\u30f3\u30b8\u30b1\u30fc\u30bf\u30fc\u5b9a\u7fa9
 TitleFollower       = \u30d5\u30a9\u30ed\u30ef\u30fc\u5b9a\u7fa9
@@ -33,5 +33,5 @@ ErrorNoTurnoutMatch = \"{0}\"\u3068\u3044\u3046\u540d\u524d\u306e\u5206\u5c90\u5
 ErrorNoSensorMatch  = \"{0}\"\u3068\u3044\u3046\u540d\u524d\u306e\u30bb\u30f3\u30b5\u30fc\u306f\u5b58\u5728\u305b\u305a\u3001\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002\n\u30a8\u30f3\u30c8\u30ea\u3092\u4fee\u6b63\u3059\u308b\u304b\u30bb\u30f3\u30b5\u30fc\u3092\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 ErrorNoMemoryMatch  = \"{0}\"\u3068\u3044\u3046\u540d\u524d\u306e\u30e1\u30e2\u30ea\u30fc\u306f\u5b58\u5728\u305b\u305a\u3001\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002\n\u30a8\u30f3\u30c8\u30ea\u3092\u4fee\u6b63\u3059\u308b\u304b\u30e1\u30e2\u30ea\u30fc\u3092\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-# title for error dialog boxen
+# title for error dialog boxes
 ErrorTitle = \u8a8d\u8a3c\u30a8\u30e9\u30fc