diff --git a/java/src/jmri/jmrit/beantable/BeanTableBundle.properties b/java/src/jmri/jmrit/beantable/BeanTableBundle.properties
index db1543dc0c5..b03006bbfa1 100644
--- a/java/src/jmri/jmrit/beantable/BeanTableBundle.properties
+++ b/java/src/jmri/jmrit/beantable/BeanTableBundle.properties
@@ -111,47 +111,6 @@ HardwareAddressToolTip = Enter an integer as the hardware address
SysNameToolTip = Enter System Name for this new item, e.g. X{0}12
where X = the prefix for your connection
and {0} = is the letter for the item type.
AddEntryToolTipLine1 = For {0} {1} use one of these patterns:
-# the following block can be deleted when added to lightmanager
-# Output connection specific patterns for system name entry in jmri.jmrit.beantable.AddNewHardwareDevicePanel (eg. Add Turnout). {0} = turnouts
-AddOutputEntryToolTipC/MRI = 3 (Node 0, Output 3)
\
-4003 (Node 4, Output 3)
\
-4:3 (Node 4, Output 3)
\
-4B3 (Node 4, Output 3)
\
-Max. value for Output: 999
-AddOutputEntryToolTipMERG = 18;21 (event 18 On; event 21 On)
\
-+18;-21 (event 18 On; event 21 Off)
\
-Soon: 18 (event 18 On; 18 Off)
\
-Soon: 2000018 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Soon: N2E18 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Max. value for Output Event: 99999
-AddOutputEntryToolTipXpressNet = 3 (Turnout 3) between 1 and 1024
-AddOutputEntryToolTipNCE = 16 (Output (Turnout) 16)
-AddOutputEntryToolTipDCC++ = 12 (ID in internal DCC++ table)
-AddOutputEntryToolTipX10 = A3 (House code A + device code)
\
-01.2A.B4 (Insteon label 01.2A.B4)
-
-# the following block can be deleted when added to sensormanager
-# Input connection specific patterns for system name entry in jmri.jmrit.beantable.AddNewHardwareDevicePanel (eg. Add Sensor).
-AddInputEntryToolTipC/MRI = 1003 (Node 1, Input 3)
\
-Max. value for Input: 999
-AddInputEntryToolTipMERG = Soon: 18 (event 18 On; 18 Off)
\
-18;21 (event 18 On; event 21 On)
\
-+18;-21 (event 18 On; event 21 Off)
\
-Soon: 2000018 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Soon: N2E18 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Advanced users:
\
-X910012;X910019 (hex CAN frame msg. Active; Inactive)
\
-Soon: 200018M07 (listen to Events 18 .. 1F)
\
-Max. value for Input Event: 99999
-AddInputEntryToolTipXpressNet = 3 (Feedback module 1, input 3)
\
-99:3 (Feedback module 99, input 3)
-AddInputEntryToolTipNCE = 4:3 (AIU Cab 4, pin 3)
\
-50 (AIU Cab 4, pin 3)
-AddInputEntryToolTipDCC++ = 12 (ID in internal DCC++ table)
\
-4:3 (converts to number 50)
-AddInputEntryToolTipX10 = A3 (House code A + device code)
\
-01.2A.B4 (Insteon label 01.2A.B4)
-
# leave 1 space at the end of the following values to display nicely in Border
LabelTurnoutNumber = Turnout 1
LabelSecondNumber = Turnout 2
diff --git a/java/src/jmri/jmrit/beantable/BeanTableBundle_ca.properties b/java/src/jmri/jmrit/beantable/BeanTableBundle_ca.properties
index 3ce14e8575d..e597c78f382 100644
--- a/java/src/jmri/jmrit/beantable/BeanTableBundle_ca.properties
+++ b/java/src/jmri/jmrit/beantable/BeanTableBundle_ca.properties
@@ -113,48 +113,6 @@ HardwareAddressToolTip = Proporciona un enter per a l'adre\u00e7a hardware per a
SysNameToolTip = Proporciona un Nom del Sistema per aquest nou element, e.g. X{0}12
on X = es el prefix de la teva connexi\u00f3
i {0} = \u00e9s la lletra per al element.
AddEntryToolTipLine1 = Per {0} {1} utilitzeu un d'aquests patrons:
-# the following block can be deleted when added to lightmanager
-# Output connection specific patterns for system name entry in jmri.jmrit.beantable.AddNewHardwareDevicePanel (eg. Add Turnout). {0} = turnouts
-AddOutputEntryToolTipC/MRI = 3 (Node 0, Output 3)
\
-4003 (Node 4, Output 3)
\
-4:3 (Node 4, Output 3)
\
-4B3 (Node 4, Output 3)
\
-Max. value for Output: 999
-AddOutputEntryToolTipMERG =
-18;21 (event 18 On; event 21 On)
\
-+18;-21 (event 18 On; event 21 Off)
\
-Soon: 18 (event 18 On; 18 Off)
\
-Soon: 2000018 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Soon: N2E18 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Max. value for Output Event: 99999
-AddOutputEntryToolTipXpressNet = 3 (Turnout 3) between 1 and 1024
-AddOutputEntryToolTipNCE = 16 (Output (Turnout) 16)
-AddOutputEntryToolTipDCC++ = 12 (ID in internal DCC++ table)
-AddOutputEntryToolTipX10 = A3 (House code A + device code)
\
-01.2A.B4 (Insteon label 01.2A.B4)
-
-# the following block can be deleted when added to sensormanager
-# Input connection specific patterns for system name entry in jmri.jmrit.beantable.AddNewHardwareDevicePanel (eg. Add Sensor).
-AddInputEntryToolTipC/MRI = 1003 (Node 1, Input 3)
\
-Max. value for Input: 999
-AddInputEntryToolTipMERG = Soon: 18 (event 18 On; 18 Off)
\
-18;21 (event 18 On; event 21 On)
\
-+18;-21 (event 18 On; event 21 Off)
\
-Soon: 2000018 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Soon: N2E18 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Advanced users:
\
-X910012;X910019 (hex CAN frame msg. Active; Inactive)
\
-Soon: 200018M07 (listen to Events 18 .. 1F)
\
-Max. value for Input Event: 99999
-AddInputEntryToolTipXpressNet = 3 (Feedback module 1, input 3)
\
-99:3 (Feedback module 99, input 3)
-AddInputEntryToolTipNCE = 4:3 (AIU Cab 4, pin 3)
\
-50 (AIU Cab 4, pin 3)
-AddInputEntryToolTipDCC++ = 12 (ID in internal DCC++ table)
\
-4:3 (converts to number 50)
-AddInputEntryToolTipX10 = A3 (House code A + device code)
\
-01.2A.B4 (Insteon label 01.2A.B4)
-
# leave 1 space at the end of the following values to display nicely in Border
LabelTurnoutNumber = N\u00famero d'Agulla:
LabelSecondNumber = Segona agulla:
diff --git a/java/src/jmri/jmrit/beantable/BeanTableBundle_cs.properties b/java/src/jmri/jmrit/beantable/BeanTableBundle_cs.properties
index f77de06eb5b..19907b73f5a 100644
--- a/java/src/jmri/jmrit/beantable/BeanTableBundle_cs.properties
+++ b/java/src/jmri/jmrit/beantable/BeanTableBundle_cs.properties
@@ -530,47 +530,6 @@ WarningInvalidRange=Neplatn\u00e9 zad\u00e1n\u00ed pro vytvo\u0159en\u00ed v\u00
SysNameToolTip= Zadejte syst\u00e9mov\u00fd n\u00e1zev pro tuto novou polo\u017eku, nap\u0159. X{0}12
kde X = p\u0159edpona pro va\u0161e p\u0159ipojen\u00ed
a {0} = je p\u00edsmeno pro typ polo\u017eky.
AddEntryToolTipLine1=Pro {0} {1} pou\u017eijte jeden z t\u011bchto vzor\u016f:
-# the following block can be deleted when added to lightmanager
-# Output connection specific patterns for system name entry in jmri.jmrit.beantable.AddNewHardwareDevicePanel (eg. Add Turnout). {0} = turnouts
-AddOutputEntryToolTipC/MRI = 3 (Uzel 0, V\u00fdstup 3)
\
-4003 (Uzel 4, V\u00fdstup 3)
\
-4:3 (Uzel 4, V\u00fdstup 3)
\
-4B3 (Uzel 4, V\u00fdstup 3)
\
-Max. hodnota pro v\u00fdstup: 999
-AddOutputEntryToolTipMERG =
-18;21 (ud\u00e1lost 18 Zap; ud\u00e1lost 21 Zap)
\
-+18;-21 (ud\u00e1lost 18 Zap; ud\u00e1lost 21 Vyp)
\
-Brzy: 18 (ud\u00e1lost 18 Zap; 18 Vyp)
\
-Brzy: 2000018 (Uzel 2 Ud\u00e1lost 18; Zap Ud\u00e1lost = Aktivn\u00ed; Vyp Ud\u00e1lost = Neaktivn\u00ed)
\
-Brzy: N2E18 (Uzel 2 Ud\u00e1lost 18; Zap Ud\u00e1lost = Aktivn\u00ed; Vyp Ud\u00e1lost = Neaktivn\u00ed)
\
-Max. hodnota pro ud\u00e1lost v\u00fdstupu: 99999
-AddOutputEntryToolTipXpressNet = 3 (V\u00fdhybka 3) mezi 1 a 1024
-AddOutputEntryToolTipNCE = 16 (V\u00fdstup (V\u00e1hybka) 16)
-AddOutputEntryToolTipDCC++ = 12 (ID v intern\u00ed tabulce DCC++)
-AddOutputEntryToolTipX10 = A3 (House code A + device code)
\
-01.2A.B4 (Insteon label 01.2A.B4)
-
-# the following block can be deleted when added to sensormanager
-# Input connection specific patterns for system name entry in jmri.jmrit.beantable.AddNewHardwareDevicePanel (eg. Add Sensor).
-AddInputEntryToolTipC/MRI = 1003 (Uzel 1, Vstup 3)
\
-Max. hodnota pro vstup: 999
-AddInputEntryToolTipMERG = Brzy: 18 (ud\u00e1lost 18 Zap; 18 Vyp)
\
-18;21 (ud\u00e1lost 18 Zap; ud\u00e1lost 21 Zap)
\
-+18;-21 (ud\u00e1lost 18 Zap; ud\u00e1lost 21 Vyp)
\
-Brzy: 2000018 (Uzel 2 Ud\u00e1lost 18; Zap Ud\u00e1lost = Aktivn\u00ed; Vyp Ud\u00e1lost = Neaktivn\u00ed)
\
-Brzy: N2E18 (Uzel 2 Ud\u00e1lost 18; Zap Ud\u00e1lost = Aktivn\u00ed; Vyp Ud\u00e1lost = Neaktivn\u00ed)
\
-Pokro\u010dil\u00ed u\u017eivatel\u00e9:
\
-X910012;X910019 (hex CAN frame msg. Active; Inactive)
\
-Brzy: 200018M07 (poslouchej ud\u00e1losti 18 .. 1F)
\
-Max. hodnota pro vstupn\u00ed ud\u00e1lost: 99999
-AddInputEntryToolTipXpressNet = 3 (Zp\u011btn\u00fd ohlas modul 1, vstup 3)
\
-99:3 (Zp\u011btn\u00fd ohlas modul 99, vstup 3)
-AddInputEntryToolTipNCE = 4:3 (AIU Cab 4, pin 3)
\
-50 (AIU Cab 4, pin 3)
-AddInputEntryToolTipDCC++ = 12 (ID v intern\u00ed tabulce DCC++)
\
-4:3 (p\u0159evede na \u010d\u00edslo 50)
-AddInputEntryToolTipX10 = A3 (House code A + device code)
\
-01.2A.B4 (Insteon label 01.2A.B4)
LightScheduleHintMinutes=Zadej minuty
diff --git a/java/src/jmri/jmrit/beantable/BeanTableBundle_da.properties b/java/src/jmri/jmrit/beantable/BeanTableBundle_da.properties
index e12f1d460d5..545567fef94 100644
--- a/java/src/jmri/jmrit/beantable/BeanTableBundle_da.properties
+++ b/java/src/jmri/jmrit/beantable/BeanTableBundle_da.properties
@@ -113,47 +113,6 @@ HardwareAddressToolTip = Indtast et heltal som hardwareadresse for
SysNameToolTip = Enter System Name for this new item, e.g. X{0}12
where X = the prefix for your connection
and {0} = is the letter for the item type.
AddEntryToolTipLine1 = For {0} {1} brug en af disse:
-# the following block can be deleted when added to lightmanager
-# Output connection specific patterns for system name entry in jmri.jmrit.beantable.AddNewHardwareDevicePanel (eg. Add Turnout). {0} = turnouts
-AddOutputEntryToolTipC/MRI = 3 (Node 0, Output 3)
\
-4003 (Node 4, Output 3)
\
-4:3 (Node 4, Output 3)
\
-4B3 (Node 4, Output 3)
\
-Max. value for Output: 999
-AddOutputEntryToolTipMERG =18;21 (event 18 On; event 21 On)
\
-+18;-21 (event 18 On; event 21 Off)
\
-Soon: 18 (event 18 On; 18 Off)
\
-Soon: 2000018 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Soon: N2E18 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Max. value for Output Event: 99999
-AddOutputEntryToolTipXpressNet = 3 (Turnout 3) between 1 and 1024
-AddOutputEntryToolTipNCE = 16 (Output (Turnout) 16)
-AddOutputEntryToolTipDCC++ = 12 (ID in internal DCC++ table)
-AddOutputEntryToolTipX10 = A3 (House code A + device code)
\
-01.2A.B4 (Insteon label 01.2A.B4)
-
-# the following block can be deleted when added to sensormanager
-# Input connection specific patterns for system name entry in jmri.jmrit.beantable.AddNewHardwareDevicePanel (eg. Add Sensor).
-AddInputEntryToolTipC/MRI = 1003 (Node 1, Input 3)
\
-Max. value for Input: 999
-AddInputEntryToolTipMERG = Soon: 18 (event 18 On; 18 Off)
\
-18;21 (event 18 On; event 21 On)
\
-+18;-21 (event 18 On; event 21 Off)
\
-Soon: 2000018 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Soon: N2E18 (Node 2 Event 18; On Event = Active; Off Event = Inactive)
\
-Advanced users:
\
-X910012;X910019 (hex CAN frame msg. Active; Inactive)
\
-Soon: 200018M07 (listen to Events 18 .. 1F)
\
-Max. value for Input Event: 99999
-AddInputEntryToolTipXpressNet = 3 (Feedback module 1, input 3)
\
-99:3 (Feedback module 99, input 3)
-AddInputEntryToolTipNCE = 4:3 (AIU Cab 4, pin 3)
\
-50 (AIU Cab 4, pin 3)
-AddInputEntryToolTipDCC++ = 12 (ID in internal DCC++ table)
\
-4:3 (converts to number 50)
-AddInputEntryToolTipX10 = A3 (House code A + device code)
\
-01.2A.B4 (Insteon label 01.2A.B4)
-
# leave 1 space at the end of the following values to display nicely in Border
LabelTurnoutNumber = Sporskifte 1
LabelSecondNumber = Sporskifte 2
diff --git a/java/src/jmri/jmrix/cmri/CmriBundle_cs.properties b/java/src/jmri/jmrix/cmri/CmriBundle_cs.properties
index 5c5cc27ee58..eee943b5e0c 100644
--- a/java/src/jmri/jmrix/cmri/CmriBundle_cs.properties
+++ b/java/src/jmri/jmrix/cmri/CmriBundle_cs.properties
@@ -7,4 +7,13 @@ MenuCMRI = C/MRI
MenuItemCommandMonitor = C/MRI monitor
MenuItemDiagnostics = Spustit diagnostiku
-MenuItemAssignments = Seznam p\u0159i\u0159azen\u00ed
\ No newline at end of file
+MenuItemAssignments = Seznam p\u0159i\u0159azen\u00ed
+
+AddOutputEntryToolTip = 3 (Uzel 0, V\u00fdstup 3)
\
+4003 (Uzel 4, V\u00fdstup 3)
\
+4:3 (Uzel 4, V\u00fdstup 3)
\
+4B3 (Uzel 4, V\u00fdstup 3)
\
+Max. hodnota pro v\u00fdstup: 999
+
+AddInputEntryToolTip = 1003 (Uzel 1, Vstup 3)
\
+Max. hodnota pro vstup: 999
diff --git a/java/src/jmri/jmrix/cmri/CmriBundle_de.properties b/java/src/jmri/jmrix/cmri/CmriBundle_de.properties
index d1c564cce3f..e29fb3a2868 100644
--- a/java/src/jmri/jmrix/cmri/CmriBundle_de.properties
+++ b/java/src/jmri/jmrix/cmri/CmriBundle_de.properties
@@ -27,7 +27,7 @@ SerialCommandMonTitle = Serieller C/MRI Kommunikationsmonitor
DiagnosticTitle = C/MRI Diagnostikprobe
# CmriTurnout/Light (Add to table pane) items
-AddOutputEntryToolTipC/MRI = 3 (Knoten 0, Ausgang 3)
\
+AddOutputEntryToolTip = 3 (Knoten 0, Ausgang 3)
\
4003 (Knoten 4, Ausgang 3)
\
4:3 (Knoten 4, Ausgang 3)
\
4B3 (Knoten 4, Ausgang 3)
\
diff --git a/java/src/jmri/jmrix/nce/NceBundle_cs.properties b/java/src/jmri/jmrix/nce/NceBundle_cs.properties
index 68c9ef26bde..ba1de2d1c63 100644
--- a/java/src/jmri/jmrix/nce/NceBundle_cs.properties
+++ b/java/src/jmri/jmrix/nce/NceBundle_cs.properties
@@ -16,3 +16,5 @@ LogNceClockRatioRangeError = NCE hodiny pom\u011br je mimo meze:
LogNceClockStopCmdError = NCE p\u0159\u00edkaz hodiny stop odpov\u011bd\u011bl:
LogNceClockStartCmdError = NCE p\u0159\u00edkaz hodiny start odpov\u011bd\u011bl:
LogAlarmTimeIntervalError = resetuji pollingInterval, neplatn\u00e1 hodnota:
+
+AddOutputEntryToolTip = 16 (V\u00fdstup (V\u00e1hybka) 16)
diff --git a/java/src/jmri/jmrix/powerline/PowerlineBundle.properties b/java/src/jmri/jmrix/powerline/PowerlineBundle.properties
index 2d8858e7573..324d4cc90f9 100644
--- a/java/src/jmri/jmrix/powerline/PowerlineBundle.properties
+++ b/java/src/jmri/jmrix/powerline/PowerlineBundle.properties
@@ -17,6 +17,8 @@ DefaultTag = Powerline_
# PowerlineTurnout/Light/Sensor (Add to table pane) items
AddOutputEntryToolTip = A3 (Output House code A + device 3)
\
-House code: A-P, device 1-16 (inclusive).
+House code: A-P, device 1-16 (inclusive).
\
+01.2A.B4 (Insteon label 01.2A.B4)
AddInputEntryToolTip = A3 (Output House code A + device 3)
\
-House code: A-P, device 1-16 (inclusive).
+House code: A-P, device 1-16 (inclusive).
\
+01.2A.B4 (Insteon label 01.2A.B4)