Skip to content

Commit

Permalink
some D&H translations to german
Browse files Browse the repository at this point in the history
some translations and very small corrections
  • Loading branch information
Klb4ever committed Aug 16, 2017
1 parent 75b2b79 commit d5a7144
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 4 deletions.
2 changes: 1 addition & 1 deletion xml/decoders/doehler_haass/SD_cv137_bits1-2.xml
Expand Up @@ -36,7 +36,7 @@
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Deactivate energy saving mode</label>
<label xml:lang="fr">Désactiver économie d'énergie</label>
<label xml:lang="de">Energiesparmodus ausschlaten</label>
<label xml:lang="de">Energiesparmodus ausschalten</label>
<label xml:lang="it">Disattiva modalità risparmio energetico</label>
</variable>
<variable item="Revert SUSI direction" CV="137" mask="XXXXXVXX" tooltip="CV137 bit 2" exclude="SD18A_1.00,SD18A_1.01,SD18A_1.02,SD21A_1.01,SD21A_1.02">
Expand Down
24 changes: 22 additions & 2 deletions xml/decoders/doehler_haass/Vars_common.xml
Expand Up @@ -31,8 +31,8 @@
<authorinitials>PB</authorinitials>
<revremark>
This file containts only variables that are common to ALL D&amp;H decoders,
in ALL versions, and in ALL firmware versions from fw3.02 and up.
</revremark>
in ALL versions, and in ALL firmware versions from fw3.02 and up.
</revremark>
</revision>
<revision>
<revnumber>2</revnumber>
Expand All @@ -52,6 +52,12 @@
<authorinitials>PB</authorinitials>
<revremark>CV50-63 shouldn't be excluded for combo sound decoders. Spelling change to match new DH def pane for start and brake options</revremark>
</revision>
<revision>
<revnumber>5</revnumber>
<date>2017-08-16</date>
<authorinitials>RK</authorinitials>
<revremark>German translation extended</revremark>
</revision>
</revhistory>
<!-- Calls to std NMRA templates -->
<xi:include href="http://jmri.org/xml/decoders/nmra/shortAndLongAddress.xml"/>
Expand Down Expand Up @@ -858,71 +864,85 @@
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F1</label>
<label xml:lang="it">Indirizzo Consist attivo per F1</label>
<label xml:lang="de">Verbundadresse aktiv für F1</label>
</variable>
<variable item="Consist Address Active For F2" CV="21" mask="XXXXXXVX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F2</label>
<label xml:lang="it">Indirizzo Consist attivo per F2</label>
<label xml:lang="de">Verbundadresse aktiv für F2</label>
</variable>
<variable item="Consist Address Active For F3" CV="21" mask="XXXXXVXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F3</label>
<label xml:lang="it">Indirizzo Consist attivo per F3</label>
<label xml:lang="de">Verbundadresse aktiv für F3</label>
</variable>
<variable item="Consist Address Active For F4" CV="21" mask="XXXXVXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F4</label>
<label xml:lang="it">Indirizzo Consist attivo per F4</label>
<label xml:lang="de">Verbundadresse aktiv für F4</label>
</variable>
<variable item="Consist Address Active For F5" CV="21" mask="XXXVXXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F5</label>
<label xml:lang="it">Indirizzo Consist attivo per F5</label>
<label xml:lang="de">Verbundadresse aktiv für F5</label>
</variable>
<variable item="Consist Address Active For F6" CV="21" mask="XXVXXXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F6</label>
<label xml:lang="it">Indirizzo Consist attivo per F6</label>
<label xml:lang="de">Verbundadresse aktiv für F6</label>
</variable>
<variable item="Consist Address Active For F7" CV="21" mask="XVXXXXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F7</label>
<label xml:lang="it">Indirizzo Consist attivo per F7</label>
<label xml:lang="de">Verbundadresse aktiv für F7</label>
</variable>
<variable item="Consist Address Active For F8" CV="21" mask="VXXXXXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F8</label>
<label xml:lang="it">Indirizzo Consist attivo per F8</label>
<label xml:lang="de">Verbundadresse aktiv für F8</label>
</variable>
<variable item="Consist Address Active For FL in Forward" CV="22" mask="XXXXXXXV">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For FL in Forward</label>
<label xml:lang="it">Indirizzo Consist attivo per luci frontali in avanti</label>
<label xml:lang="de">Verbundadresse aktiv für Lvor in vorwärts</label>
</variable>
<variable item="Consist Address Active For FL in Reverse" CV="22" mask="XXXXXXVX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For FL in Reverse</label>
<label xml:lang="it">Indirizzo Consist attivo per luci frontali in retro</label>
<label xml:lang="de">Verbundadresse aktiv für Lvor in rückwärts</label>
</variable>
<variable item="Consist Address Active For F9" CV="22" mask="XXXXXVXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F9</label>
<label xml:lang="it">Indirizzo Consist attivo per F9</label>
<label xml:lang="de">Verbundadresse aktiv für F9</label>
</variable>
<variable item="Consist Address Active For F10" CV="22" mask="XXXXVXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F10</label>
<label xml:lang="it">Indirizzo Consist attivo per F10</label>
<label xml:lang="de">Verbundadresse aktiv für F10</label>
</variable>
<variable item="Consist Address Active For F11" CV="22" mask="XXXVXXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F11</label>
<label xml:lang="it">Indirizzo Consist attivo per F11</label>
<label xml:lang="de">Verbundadresse aktiv für F11</label>
</variable>
<variable item="Consist Address Active For F12" CV="22" mask="XVXXXXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Consist Address Active For F12</label>
<label xml:lang="it">Indirizzo Consist attivo per F12</label>
<label xml:lang="de">Verbundadresse aktiv für F12</label>
</variable>
<!-- Definitions for D&H Options -->
<!-- Dimming -->
Expand Down
8 changes: 7 additions & 1 deletion xml/decoders/doehler_haass/cv137_energysaving_fw3.03.xml
Expand Up @@ -25,6 +25,12 @@
</author>
</authorgroup>
<revhistory xmlns="http://docbook.org/ns/docbook">
<revision>
<revnumber>2</revnumber>
<date>2017-08-16</date>
<authorinitials>RK</authorinitials>
<revremark>little correction in german translation.</revremark>
</revision>
<revision>
<revnumber>1</revnumber>
<date>2014-02-20</date>
Expand All @@ -36,7 +42,7 @@
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Deactivate energy saving mode</label>
<label xml:lang="fr">Désactiver économie d'énergie</label>
<label xml:lang="de">Energiesparmodus ausschlaten</label>
<label xml:lang="de">Energiesparmodus ausschalten</label>
<label xml:lang="it">Disattiva modalità risparmio energetico</label>
</variable>
</variables>
12 changes: 12 additions & 0 deletions xml/decoders/doehler_haass/cv14_analogModeFunction.xml
Expand Up @@ -40,35 +40,47 @@
<authorinitials>EF</authorinitials>
<revremark>Italian translation 2014</revremark>
</revision>
<revision>
<revnumber>3</revnumber>
<date>2017-08-16</date>
<authorinitials>RK</authorinitials>
<revremark>German translation</revremark>
</revision>
</revhistory>
<variable item="Analog Mode Function Status - FL(f)" CV="14" mask="XXXXXXXV" default="1">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Analog Mode Function Status - FL(f)</label>
<label xml:lang="it">Stato Funzioni in analogico - Luci in avanti</label>
<label xml:lang="de">Funktionsstatus im Analogbetrieb - FL(f)</label>
</variable>
<variable item="Analog Mode Function Status - FL(r)" CV="14" mask="XXXXXXVX" default="1">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Analog Mode Function Status - FL(r)</label>
<label xml:lang="it">Stato Funzioni in analogico - Luci in retro</label>
<label xml:lang="de">Funktionsstatus im Analogbetrieb - FL(r)</label>
</variable>
<variable item="Analog Mode Function Status - F9" CV="14" mask="XXXXXVXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Analog Mode Function Status - F9</label>
<label xml:lang="it">Stato Funzioni in analogico - F9</label>
<label xml:lang="de">Funktionsstatus im Analogbetrieb - F9</label>
</variable>
<variable item="Analog Mode Function Status - F10" CV="14" mask="XXXXVXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Analog Mode Function Status - F10</label>
<label xml:lang="it">Stato Funzioni in analogico - F10</label>
<label xml:lang="de">Funktionsstatus im Analogbetrieb - F10</label>
</variable>
<variable item="Analog Mode Function Status - F11" CV="14" mask="XXXVXXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Analog Mode Function Status - F11</label>
<label xml:lang="it">Stato Funzioni in analogico - F11</label>
<label xml:lang="de">Funktionsstatus im Analogbetrieb - F11</label>
</variable>
<variable item="Analog Mode Function Status - F12" CV="14" mask="XXVXXXXX">
<xi:include href="http://jmri.org/xml/decoders/parts/enum-OffOn.xml"/>
<label>Analog Mode Function Status - F12</label>
<label xml:lang="it">Stato Funzioni in analogico - F12</label>
<label xml:lang="de">Funktionsstatus im Analogbetrieb - F12</label>
</variable>
</variables>

0 comments on commit d5a7144

Please sign in to comment.