Skip to content
Permalink
Browse files

fix: use registered trademark for app name

  • Loading branch information...
rhwood committed Aug 6, 2019
1 parent 2f63083 commit 55a18739deaebdcd67b9150597d83272659253db
Showing with 176 additions and 174 deletions.
  1. +1 −1 help/en/html/apps/DecoderPro/Debug.shtml
  2. +1 −1 help/en/html/apps/DecoderPro/FAQ.shtml
  3. +1 −1 help/en/html/apps/DecoderPro/Files.shtml
  4. +1 −1 help/en/html/apps/DecoderPro/NetworkFiles.shtml
  5. +1 −1 help/en/html/apps/DecoderPro/Programmer.shtml
  6. +1 −1 help/en/html/apps/DecoderPro/Tour.shtml
  7. +2 −2 help/en/html/doc/Technical/StartUpScripts.shtml
  8. +1 −1 help/en/html/hardware/XPressNet/CreateXNetLogFile.shtml
  9. +1 −1 help/en/html/setup/Files.shtml
  10. +1 −1 help/en/html/tools/speedometer/NCE-Speedometer.shtml
  11. +1 −1 help/en/manual/DecoderPro/Basic_BasicPane.shtml
  12. +1 −1 help/en/manual/DecoderPro/Comp_GlobalCVs.shtml
  13. +4 −4 help/en/manual/DecoderPro/Comp_Speed.shtml
  14. +4 −4 help/en/manual/DecoderPro/Programmer_ServiceMode.shtml
  15. +4 −4 help/en/manual/DecoderPro/Programmer_Start.shtml
  16. +2 −2 help/en/manual/DecoderPro/Start_DCC.shtml
  17. +2 −2 help/en/manual/DecoderPro/Start_DCC_Hardware.shtml
  18. +2 −2 help/en/manual/DecoderPro/Start_DCC_Systems.shtml
  19. +1 −1 help/en/manual/DecoderPro/Start_DecoderPro.shtml
  20. +1 −1 help/en/manual/DecoderPro/Start_Preferences.shtml
  21. +1 −1 help/en/manual/DecoderPro/index.shtml
  22. +1 −1 help/en/manual/DecoderPro3/Basic_BasicPane.shtml
  23. +1 −1 help/en/manual/DecoderPro3/Comp_GlobalCVs.shtml
  24. +4 −4 help/en/manual/DecoderPro3/Comp_Speed.shtml
  25. +4 −4 help/en/manual/DecoderPro3/Programmer_ServiceMode.shtml
  26. +2 −2 help/en/manual/DecoderPro3/Start_DCC.shtml
  27. +2 −2 help/en/manual/DecoderPro3/Start_DCC_Hardware.shtml
  28. +1 −1 help/en/manual/DecoderPro3/Start_DCC_Systems.shtml
  29. +1 −1 help/en/manual/DecoderPro3/Start_DecoderPro.shtml
  30. +1 −1 help/en/manual/DecoderPro3/Start_DecoderPro_New.shtml
  31. +1 −1 help/en/manual/DecoderPro3/dp3_Main_file_print_entry.shtml
  32. +1 −1 help/en/manual/index.shtml
  33. +11 −11 help/en/package/apps/gui3/dp3/DecoderPro3.shtml
  34. +1 −1 help/en/package/jmri/jmrit/symbolicprog/tabbedframe/PaneOpsProgFrame.shtml
  35. +1 −1 help/en/package/jmri/jmrit/symbolicprog/tabbedframe/PaneProgFrame.shtml
  36. +1 −1 help/fr/html/apps/DecoderPro/NetworkFiles.shtml
  37. +1 −1 help/fr/html/apps/DecoderPro/Tour.shtml
  38. +1 −1 help/fr/html/doc/Technical/StartUpScripts.shtml
  39. +1 −1 help/fr/html/hardware/XPressNet/CreateXNetLogFile.shtml
  40. +2 −2 help/fr/html/tools/speedometer/NCE-Speedometer.shtml
  41. +1 −1 help/fr/html/tools/throttle/ThrottleMain.shtml
  42. +1 −1 help/fr/manual/decoderPro/Basic_BasicPane.shtml
  43. +1 −1 help/fr/manual/index.shtml
  44. +5 −5 help/fr/package/apps/gui3/dp3/DecoderPro3.shtml
  45. +1 −1 help/fr/package/jmri/jmrit/symbolicprog/tabbedframe/PaneOpsProgFrame.shtml
  46. +1 −1 help/fr/package/jmri/jmrit/symbolicprog/tabbedframe/PaneProgFrame.shtml
  47. +77 −75 java/acceptancetest/step_definitions/apps/ApplicationTestAcceptanceSteps.java
  48. +1 −1 java/src/apps/AppsBundle_cs.properties
  49. +1 −1 java/src/apps/gui3/FirstTimeStartUpWizard.java
  50. +1 −1 java/src/apps/gui3/FirstTimeStartUpWizardAction.java
  51. +2 −2 java/src/apps/gui3/dp3/DecoderPro3Window.java
  52. +1 −1 java/test/apps/gui3/FirstTimeStartUpWizardTest.java
  53. +1 −1 java/test/apps/gui3/dp3/DecoderPro3Test.java
  54. +1 −1 java/test/apps/gui3/paned/PanedTest.java
  55. +1 −1 jython/PM42forCTC.py
  56. +1 −1 jython/PM4Announce.py
  57. +1 −1 jython/dccspecialties/programblockwatchermaster.py
  58. +1 −1 jython/dccspecialties/programharemaster.py
  59. +1 −1 jython/dccspecialties/programpsx-and-psx-armaster.py
  60. +1 −1 jython/dccspecialties/programwabbitmaster.py
  61. +1 −1 jython/dccspecialties/programwabbitmasterrevh.py
  62. +2 −2 scripts/CONTENTS.DecoderPro
@@ -82,7 +82,7 @@
by trying to open the file with Internet Explorer. The
debugging information it provides is generally more
detailed than that provided by the XML routines in the
JDOM libraries used by JMRI and Decoder Pro.</p>
JDOM libraries used by JMRI and DecoderPro.</p>

<p>Note that Explorer needs to see both the .xml file,
plus the definition information in the .dtd file. If you
@@ -37,7 +37,7 @@

<h2>Frequently Asked Questions</h2>

<p>This page is the JMRI Decoder Pro "frequently asked
<p>This page is the JMRI DecoderPro "frequently asked
questions" list. Items get listed here if they're asked a
lot, even if they're also available somewhere else.</p>

@@ -119,7 +119,7 @@
<strong>programmers</strong> subdirectory when you've
used at least one Programmer; these define the formats
for the various programming sheets that are available
in Decoder Pro.</li>
in DecoderPro.</li>

<li>The DecoderPro folder, containing your
profiles.</li>
@@ -46,7 +46,7 @@
together (Windows XP clients and a Windows 2000 Server). I
would like to store the roster and all else that is needed
on the Windows 2000 server and be able to run copies of
Decoder Pro on at lease two of the Windows XP PC's. Is that
DecoderPro on at lease two of the Windows XP PC's. Is that
possible?
</blockquote>Yes!

@@ -340,7 +340,7 @@
<dd>
<p>All of the .xml files in the "programmers"
subdirectory will appear in the selection box when you
create a new programmer in Decoder Pro. To use your new
create a new programmer in DecoderPro. To use your new
file, just put it in the "programmers" subdirectory of
the "prefs" directory and select it. You don't have to
restart the program, as the list is remade each time you
@@ -217,7 +217,7 @@
one CV. Another example is configuring a Soundtraxx
decoder's mapping between functions and sounds. This
involves bits and values spread across a dozen
different CVs, but Decoder Pro turns that
different CVs, but DecoderPro turns that
configuration job into simple checking of boxes.</p>

<p>Each selection box, checkbox or radiobutton is
@@ -560,7 +560,7 @@

<dt>Comment</dt>

<dd>Start Decoder Pro</dd>
<dd>Start DecoderPro</dd>

<dt>Icon</dt>

@@ -615,7 +615,7 @@

<dt>Comment</dt>

<dd>Start Decoder Pro</dd>
<dd>Start DecoderPro</dd>

<dt>Icon</dt>

@@ -25,7 +25,7 @@
<div id="mainContent">
<h1>Hardware Support: XpressNet - Creating an Log File</h1>

<p>Start Decoder Pro.</p>
<p>Start DecoderPro.</p>

<p>Open the <strong>XpressNet Monitor</strong> (this is in
the XpressNet submenu of the "Systems" menu)</p>
@@ -124,7 +124,7 @@
<strong>programmers</strong> subdirectory when you've
used at least one Programmer; these define the formats
for the various programming sheets that are available
in Decoder Pro.</li>
in DecoderPro.</li>

<li>The DecoderPro folder, containing your
profiles.</li>
@@ -46,7 +46,7 @@
accomplished with the AIU (Auxiliary Input Unit) manufactured
by NCE as well. The AIU needs to be connected with the cab
bus. Once the AIU is connected into the cab bus, and thus
into the Command Station, Decoder Pro does the rest.</p>
into the Command Station, DecoderPro does the rest.</p>

<p>The track used must be connected to the mainline from the
NCE system. Do NOT connect it to the programming tracking
@@ -132,7 +132,7 @@
The individual settings will turn red while they are in the
process of being read (clever, eh?), and will turn white once
the values have been read successfully from the decoder. Once
again, Decoder Pro must play "Twenty Questions" to get this
again, DecoderPro must play "Twenty Questions" to get this
information, and sometimes even has to ask a couple of times.

<p>Be patient, especially with older computers. At the very
@@ -100,7 +100,7 @@

<p>One thing to keep in mind about the <b>CV</b> listing on
this pane - anything you can do here you can do from one of
the other panes in Decoder Pro, without having to know the
the other panes in DecoderPro, without having to know the
<b>CV</b> number or how to compile the values to get the
desired effect. This pane is meant for advanced users of DCC
used to crunching the numbers themselves. Those new to DCC
@@ -64,7 +64,7 @@
Vmid and Vhigh. They work together to make a very basic three
point speed table. On some decoders these settings may be
labeled differently and all three may not be available.
Decoder Pro will show the correct options for your selected
DecoderPro will show the correct options for your selected
decoder.</p>

<p><b>Vstart</b>(<strong>Start Voltage</strong>) is the
@@ -95,7 +95,7 @@
particular, if the <strong>Vmid</strong> is lower than
<strong>Vstart</strong> or higher than
<strong>Vhigh</strong>, results can be highly unpredictable.
Decoder Pro will not let you make this mistake.</p>
DecoderPro will not let you make this mistake.</p>

<p><b>Forward Trim</b> and <b>Reverse Trim</b> allow you to
compensate for differences in the forward speed and reverse
@@ -165,12 +165,12 @@
<p>There are no hard and fast rules for the exact numbers
to use. Even identical locomotives with identical decoders
will need different numbers, due to variances in motors and
drive trains. Experiment with the settings - Decoder Pro
drive trains. Experiment with the settings - DecoderPro
makes it easy!</p>

<p>Note: Not all decoders will have Start, Mid and Max
Volts, but will have some version of this which will be
displayed by Decoder Pro for the specific decoder.</p>
displayed by DecoderPro for the specific decoder.</p>
</div>
<hr>

@@ -127,7 +127,7 @@
locomotive from the list. An alternative is to be lazy and
click the <strong>IDENT</strong> button. The program will
then query the locomotive to get it's address which is
linked to the roster entry. The Decoder Pro roster entry
linked to the roster entry. The DecoderPro roster entry
includes the decoder type used when it programmed the
locomotive. If it gets a valid address, but there is no
roster entry with that address, then you will get an error
@@ -148,7 +148,7 @@
number. (Letters are often used to separate the shape
differences which have no bearing on the electronic
functions of the decoder.) Just be aware that some
functions that Decoder Pro allows you to program may not be
functions that DecoderPro allows you to program may not be
fully operable.</p>

<p>As noted above, these methods will work only with
@@ -165,7 +165,7 @@

<p>If you have a decoder that doesn't appear in the
listing, you may want to check to be sure that you are
using the most up to date version of Decoder Pro, because
using the most up to date version of DecoderPro, because
manufacturers are adding models almost faster than the team
can enter the new decoder definitions into the files. You
can choose a manufacturer's version which is as close as
@@ -177,7 +177,7 @@
entry. It is preset by your Preferences entry, but you can
select other programmers using the drop down arrow.</p>

<p>Once you have selected a decoder, or Decoder Pro has
<p>Once you have selected a decoder, or DecoderPro has
done it for you, the <strong>Open Programmer</strong>
button will become activated and you'll be able to move on
with Service Mode Programming.</p>
@@ -143,7 +143,7 @@
click the <strong><input name="Ident" id="Ident" value=
"Ident" type="button"></strong> . The program will then query
the locomotive to get it's address which is linked to the
roster entry. The Decoder Pro roster entry includes the
roster entry. The DecoderPro roster entry includes the
decoder type used when it programmed the locomotive. If it
gets a valid address, but there is no roster entry with that
address, then you will get an error message.</p>
@@ -171,7 +171,7 @@
of the ones with the fewest letters in the model number.
(Letters are often used to separate the shape differences
which have no bearing on the electronic functions of the
decoder.) Just be aware that some functions that Decoder Pro
decoder.) Just be aware that some functions that DecoderPro
allows you to program may not be fully operable.</p>

<p>As noted above, these methods will work only with command
@@ -188,7 +188,7 @@

<p>If you have a decoder that doesn't appear in the listing,
you may want to check to be sure that you are using the most
up to date version of Decoder Pro, because manufacturers are
up to date version of DecoderPro, because manufacturers are
adding models almost faster than the team can enter the new
decoder definitions into the files. You can choose a
manufacturer's version which is as close as you can find, or
@@ -203,7 +203,7 @@
to do much damage if you make mistakes. We'll get into the
other programmers later on.</p>

<p>Once you have selected a decoder, or Decoder Pro has done
<p>Once you have selected a decoder, or DecoderPro has done
it for you, the <strong><input name="button9" id="button9"
value="Open Programmer" type="button"></strong> will become
activated and you'll be able to move on with Service Mode
@@ -6,7 +6,7 @@
<meta name="generator" content=
"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">

<title>Decoder Pro Manual: Getting Started</title><!-- Style -->
<title>DecoderPro Manual: Getting Started</title><!-- Style -->
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
<link rel="stylesheet" type="text/css" href="/css/default.css"
@@ -69,7 +69,7 @@
with very little memory, it can get very complex for those of
us that are not on speaking terms with binary code.</p>

<p>Decoder Pro attempts to help overcome the inevitable
<p>DecoderPro attempts to help overcome the inevitable
complexity of this system by providing a clear, usable, user
friendly <span class="ACCENT">open source</span> software
solution for programming these on-board decoders. Programming
@@ -6,7 +6,7 @@
<meta name="generator" content=
"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">

<title>Decoder Pro Manual: Getting Started</title><!-- Style -->
<title>DecoderPro Manual: Getting Started</title><!-- Style -->
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
<link rel="stylesheet" type="text/css" href="/css/default.css"
@@ -64,7 +64,7 @@

<p>For those who do not have any DCC hardware yet and are
considering purchasing a DCC locomotive and want to use
Decoder Pro to program it consider the SPROG II USB. It has
DecoderPro to program it consider the SPROG II USB. It has
all the electronics in one package with enough output to run
a locomotive. It comes complete with the USB cable, power
supply, instructions and JMRI on disk. All you need in
@@ -6,7 +6,7 @@
<meta name="generator" content=
"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">

<title>Decoder Pro Manual: Getting Started</title><!-- Style -->
<title>DecoderPro Manual: Getting Started</title><!-- Style -->
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
<link rel="stylesheet" type="text/css" href="/css/default.css"
@@ -32,7 +32,7 @@

<h1>Getting Started with DecoderPro&reg;</h1>

<h2>What DCC systems will Decoder Pro work with?</h2>
<h2>What DCC systems will DecoderPro work with?</h2>

<div align="right">
<p><a href="Basic_Programming.shtml"></a><a href=
@@ -6,7 +6,7 @@
<meta name="generator" content=
"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">

<title>Decoder Pro Manual: Getting Started</title><!-- Style -->
<title>DecoderPro Manual: Getting Started</title><!-- Style -->
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
<link rel="stylesheet" type="text/css" href="/css/default.css"
@@ -6,7 +6,7 @@
<meta name="generator" content=
"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">

<title>Decoder Pro Manual: Getting Started</title>
<title>DecoderPro Manual: Getting Started</title>
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
<link rel="stylesheet" type="text/css" href="/css/default.css"
@@ -62,7 +62,7 @@
applications.</p>

<p>If this is your first visit to our manual we suggest that
you take the Decoder Pro&reg; tour at <a target="_blank"
you take the DecoderPro&reg; tour at <a target="_blank"
href="http://jmri.org/help/en/html/apps/DecoderPro/Tour.shtml">
http://jmri.org/help/en/html/apps/DecoderPro/Tour.shtml</a><br>

@@ -102,7 +102,7 @@
The individual settings will turn red while they are in the
process of being read (clever, eh?), and will turn white once
the values have been read successfully from the decoder. Once
again, Decoder Pro must play "Twenty Questions" to get this
again, DecoderPro must play "Twenty Questions" to get this
information, and sometimes even has to ask a couple of times.

<p>Be patient, especially with older computers. At the very
@@ -96,7 +96,7 @@

<p>One thing to keep in mind about the <b>CV</b> listing on
this pane - anything you can do here you can do from one of
the other panes in Decoder Pro, without having to know the
the other panes in DecoderPro, without having to know the
<b>CV</b> number or how to compile the values to get the
desired effect. This pane is meant for advanced users of DCC
used to crunching the numbers themselves. Those new to DCC
@@ -70,7 +70,7 @@
Vmid and Vhigh. They work together to make a very basic three
point speed table. On some decoders these settings may be
labeled differently and all three may not be available.
Decoder Pro will show the correct options for your selected
DecoderPro will show the correct options for your selected
decoder.</p>

<p>Possible setting that can appear on this TAB.</p>
@@ -105,7 +105,7 @@
particular, if the <strong>Vmid</strong> is lower than
<strong>Vstart</strong> or higher than
<strong>Vhigh</strong>, results can be highly unpredictable.
Decoder Pro will not let you make this mistake.</p>
DecoderPro will not let you make this mistake.</p>

<p><b>Forward Trim</b> and <b>Reverse Trim</b> allow you to
compensate for differences in the forward speed and reverse
@@ -175,12 +175,12 @@
<p>There are no hard and fast rules for the exact numbers
to use. Even identical locomotives with identical decoders
will need different numbers, due to variances in motors and
drive trains. Experiment with the settings - Decoder Pro
drive trains. Experiment with the settings - DecoderPro
makes it easy!</p>

<p>Note: Not all decoders will have Start, Mid and Max
Volts, but will have some version of this which will be
displayed by Decoder Pro for the specific decoder.</p>
displayed by DecoderPro for the specific decoder.</p>
</div>
<hr>

@@ -145,7 +145,7 @@
locomotive from the list. An alternative is to be lazy and
click the <strong>IDENT</strong> button. The program will
then query the locomotive to get it's address which is
linked to the roster entry. The Decoder Pro roster entry
linked to the roster entry. The DecoderPro roster entry
includes the decoder type used when it programmed the
locomotive. If it gets a valid address, but there is no
roster entry with that address, then you will get an error
@@ -166,7 +166,7 @@
number. (Letters are often used to separate the shape
differences which have no bearing on the electronic
functions of the decoder.) Just be aware that some
functions that Decoder Pro allows you to program may not be
functions that DecoderPro allows you to program may not be
fully operable.</p>

<p>As noted above, these methods will work only with
@@ -183,7 +183,7 @@

<p>If you have a decoder that doesn't appear in the
listing, you may want to check to be sure that you are
using the most up to date version of Decoder Pro, because
using the most up to date version of DecoderPro, because
manufacturers are adding models almost faster than the team
can enter the new decoder definitions into the files. You
can choose a manufacturer's version which is as close as
@@ -196,7 +196,7 @@
entry. It is preset by your Preferences entry, but you can
select other programmers using the drop down arrow.</p>

<p>Once you have selected a decoder, or Decoder Pro has
<p>Once you have selected a decoder, or DecoderPro has
done it for you, the <strong>Open Programmer</strong>
button will become activated and you'll be able to move on
with Service Mode Programming.</p>

0 comments on commit 55a1873

Please sign in to comment.
You can’t perform that action at this time.