Skip to content

Commit 9966b0e

Browse files
committed
Merge branch '171-tcc-info-description-update' into 'master'
Resolve "TCC info description update" Closes #171 See merge request tuxedocomputers/development/tuxedo-control-center!77
2 parents 226e4ad + c1dabc2 commit 9966b0e

File tree

4 files changed

+65
-59
lines changed

4 files changed

+65
-59
lines changed

src/ng-app/app/info/info.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727

2828
<mat-divider class="divider-separator"></mat-divider>
2929

30-
<div i18n>
31-
<p>
30+
<div>
31+
<p i18n="@@cInfoTCCDescriptionTextP1">
3232
With the TUXEDO Control Center, we have developed a unique tool for you to control and monitor all
3333
safety, performance, energy, comfort, and lifetime functions of your TUXEDO computer.
3434
</p>
35-
<p>
36-
With 3 premade as well as any number of individually configurable profiles, you have
35+
<p i18n="@@cInfoTCCDescriptionTextP2">
36+
With premade as well as any number of individually configurable profiles, you have
3737
the greatest possible control and adaptability of your TUXEDO device to your needs.
3838
</p>
3939
</div>

src/ng-app/assets/locale/lang.de.xlf

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -442,57 +442,55 @@ Die Informationen werden anschließend automatisch zusammen mit Ihrer Ticketnumm
442442
<target state="translated">alle LEDs aus</target>
443443
<context-group purpose="location">
444444
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
445-
<context context-type="linenumber">162</context>
445+
<context context-type="linenumber">164</context>
446446
</context-group>
447447
</trans-unit>
448448
<trans-unit id="odmLEDOne" datatype="html">
449449
<source>one LED on</source>
450450
<target state="translated">1 LED an</target>
451451
<context-group purpose="location">
452452
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
453-
<context context-type="linenumber">163</context>
453+
<context context-type="linenumber">165</context>
454454
</context-group>
455455
</trans-unit>
456456
<trans-unit id="odmLEDTwo" datatype="html">
457457
<source>two LEDs on</source>
458458
<target state="translated">beide LEDs an</target>
459459
<context-group purpose="location">
460460
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
461-
<context context-type="linenumber">164</context>
461+
<context context-type="linenumber">166</context>
462462
</context-group>
463463
</trans-unit>
464464
<trans-unit id="tdpLabelsPL1" datatype="html">
465465
<source>Sustained Power Limit (PL1)</source>
466466
<target state="translated">Dauerhafte Maximalleistung (PL1)</target>
467467
<context-group purpose="location">
468468
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
469-
<context context-type="linenumber">210</context>
469+
<context context-type="linenumber">212</context>
470470
</context-group>
471471
</trans-unit>
472472
<trans-unit id="tdpLabelsPL2" datatype="html">
473473
<source>Short-term (max. 28 sec) Power Limit (PL2)</source>
474474
<target state="needs-adaptation">Kurzzeitige (max. 28 Sek.) Maximalleistung (PL2)</target>
475-
<note from="XLIFF Sync" annotates="general" priority="1">Source text has changed. Please review the translation.</note>
476475
<context-group purpose="location">
477476
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
478-
<context context-type="linenumber">211</context>
477+
<context context-type="linenumber">213</context>
479478
</context-group>
480479
</trans-unit>
481480
<trans-unit id="tdpLabelsPL4" datatype="html">
482481
<source>Peak (max. 8 sec) Power Limit (PL4)</source>
483482
<target state="needs-adaptation">Kurzzeitige (max. 8 Sek) Maximalleistung (PL4)</target>
484-
<note from="XLIFF Sync" annotates="general" priority="1">Source text has changed. Please review the translation.</note>
485483
<context-group purpose="location">
486484
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
487-
<context context-type="linenumber">212</context>
485+
<context context-type="linenumber">214</context>
488486
</context-group>
489487
</trans-unit>
490488
<trans-unit id="cProfMgrDetailsStateSelectButtonAlreadySet" datatype="html" approved="yes">
491489
<source> (already set)</source>
492490
<target phase-name="approval-1" state="signed-off"> (bereits festgelegt)</target>
493491
<context-group purpose="location">
494492
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
495-
<context context-type="linenumber">499</context>
493+
<context context-type="linenumber">505</context>
496494
</context-group>
497495
</trans-unit>
498496
<trans-unit id="cProfMgrButtonDiscardTooltip" datatype="html" approved="yes">
@@ -767,19 +765,20 @@ Die Informationen werden anschließend automatisch zusammen mit Ihrer Ticketnumm
767765
<context context-type="linenumber">21</context>
768766
</context-group>
769767
</trans-unit>
770-
<trans-unit id="cc363dec382fbe3f178f63e99e788a4bf6fb8053" datatype="html">
771-
<source><x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>&#10; "/> With the TUXEDO Control Center, we have developed a unique tool for you to control and monitor all safety, performance, energy, comfort, and lifetime functions of your TUXEDO computer. <x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/><x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>&#10; "/> With 3 premade as well as any number of individually configurable profiles, you have the greatest possible control and adaptability of your TUXEDO device to your needs. <x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/></source>
772-
<target phase-name="approval-1" state="needs-adaptation">
773-
<x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>"/>
774-
Mit dem TUXEDO Control Center haben wir ein einzigartiges Werkzeug für Sie entwickelt, mit dem Sie sämtliche Sicherheits-, Leistungs-, Energie-, Komfort- und Lebensdauerfunktionen Ihres TUXEDO Computers steuern und überwachen können.
775-
<x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/>
776-
<x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>"/>
777-
Mit 3 vorgefertigten sowie beliebig vielen individuell konfigurierbaren Profilen erhalten Sie größtmögliche Kontrolle und Anpassbarkeit Ihres TUXEDO Gerätes an Ihre Bedürfnisse.
778-
<x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/>
779-
</target>
768+
<trans-unit id="cInfoTCCDescriptionTextP1" datatype="html">
769+
<source> With the TUXEDO Control Center, we have developed a unique tool for you to control and monitor all safety, performance, energy, comfort, and lifetime functions of your TUXEDO computer. </source>
770+
<target state="translated">Mit dem TUXEDO Control Center haben wir ein einzigartiges Werkzeug für Sie entwickelt, mit dem Sie sämtliche Sicherheits-, Leistungs-, Energie-, Komfort- und Lebensdauerfunktionen Ihres TUXEDO Computers steuern und überwachen können.</target>
780771
<context-group purpose="location">
781772
<context context-type="sourcefile">src/ng-app/app/info/info.component.html</context>
782-
<context context-type="linenumber">31,36</context>
773+
<context context-type="linenumber">32,34</context>
774+
</context-group>
775+
</trans-unit>
776+
<trans-unit id="cInfoTCCDescriptionTextP2" datatype="html">
777+
<source> With premade as well as any number of individually configurable profiles, you have the greatest possible control and adaptability of your TUXEDO device to your needs. </source>
778+
<target state="translated">Mit vorgefertigten sowie beliebig vielen individuell konfigurierbaren Profilen erhalten Sie größtmögliche Kontrolle und Anpassbarkeit Ihres TUXEDO Gerätes an Ihre Bedürfnisse.</target>
779+
<context-group purpose="location">
780+
<context context-type="sourcefile">src/ng-app/app/info/info.component.html</context>
781+
<context context-type="linenumber">36,38</context>
783782
</context-group>
784783
</trans-unit>
785784
<trans-unit id="89f1f8c98e581f2a72a68620a75c13f132c34b48" datatype="html">
@@ -1959,15 +1958,15 @@ Handelsregisternummer HRB 27755
19591958
<target state="translated">Diese Funktion wird von ihrem Gerät nicht unterstützt.</target>
19601959
<context-group purpose="location">
19611960
<context context-type="sourcefile">src/ng-app/app/compatibility.service.ts</context>
1962-
<context context-type="linenumber">72</context>
1961+
<context context-type="linenumber">74</context>
19631962
</context-group>
19641963
</trans-unit>
19651964
<trans-unit id="compatibilityMessageNoWebcamSwitch" datatype="html">
19661965
<source>This feature is not supported on your model.</source>
19671966
<target state="translated">Diese Funktion wird von ihrem Gerät nicht unterstützt.</target>
19681967
<context-group purpose="location">
19691968
<context context-type="sourcefile">src/ng-app/app/compatibility.service.ts</context>
1970-
<context context-type="linenumber">80</context>
1969+
<context context-type="linenumber">82</context>
19711970
</context-group>
19721971
</trans-unit>
19731972
</body>

src/ng-app/assets/locale/lang.en.xlf

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -443,55 +443,55 @@
443443
<target state="translated">all LEDs off</target>
444444
<context-group purpose="location">
445445
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
446-
<context context-type="linenumber">162</context>
446+
<context context-type="linenumber">164</context>
447447
</context-group>
448448
</trans-unit>
449449
<trans-unit id="odmLEDOne" datatype="html">
450450
<source>one LED on</source>
451451
<target state="translated">one LED on</target>
452452
<context-group purpose="location">
453453
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
454-
<context context-type="linenumber">163</context>
454+
<context context-type="linenumber">165</context>
455455
</context-group>
456456
</trans-unit>
457457
<trans-unit id="odmLEDTwo" datatype="html">
458458
<source>two LEDs on</source>
459459
<target state="translated">two LEDs on</target>
460460
<context-group purpose="location">
461461
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
462-
<context context-type="linenumber">164</context>
462+
<context context-type="linenumber">166</context>
463463
</context-group>
464464
</trans-unit>
465465
<trans-unit id="tdpLabelsPL1" datatype="html">
466466
<source>Sustained Power Limit (PL1)</source>
467467
<target state="translated">Sustained Power Limit (PL1)</target>
468468
<context-group purpose="location">
469469
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
470-
<context context-type="linenumber">210</context>
470+
<context context-type="linenumber">212</context>
471471
</context-group>
472472
</trans-unit>
473473
<trans-unit id="tdpLabelsPL2" datatype="html">
474474
<source>Short-term (max. 28 sec) Power Limit (PL2)</source>
475475
<target state="translated">Short-term (max. 28 sec) Power Limit (PL2)</target>
476476
<context-group purpose="location">
477477
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
478-
<context context-type="linenumber">211</context>
478+
<context context-type="linenumber">213</context>
479479
</context-group>
480480
</trans-unit>
481481
<trans-unit id="tdpLabelsPL4" datatype="html">
482482
<source>Peak (max. 8 sec) Power Limit (PL4)</source>
483483
<target state="translated">Peak (max. 8 sec) Power Limit (PL4)</target>
484484
<context-group purpose="location">
485485
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
486-
<context context-type="linenumber">212</context>
486+
<context context-type="linenumber">214</context>
487487
</context-group>
488488
</trans-unit>
489489
<trans-unit id="cProfMgrDetailsStateSelectButtonAlreadySet" datatype="html">
490490
<source> (already set)</source>
491491
<target state="translated"> (already set)</target>
492492
<context-group purpose="location">
493493
<context context-type="sourcefile">src/ng-app/app/profile-details-edit/profile-details-edit.component.ts</context>
494-
<context context-type="linenumber">499</context>
494+
<context context-type="linenumber">505</context>
495495
</context-group>
496496
</trans-unit>
497497
<trans-unit id="cProfMgrButtonDiscardTooltip" datatype="html">
@@ -766,18 +766,20 @@
766766
<context context-type="linenumber">21</context>
767767
</context-group>
768768
</trans-unit>
769-
<trans-unit id="cc363dec382fbe3f178f63e99e788a4bf6fb8053" datatype="html">
770-
<source><x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>&#10; "/> With the TUXEDO Control Center, we have developed a unique tool for you to control and monitor all safety, performance, energy, comfort, and lifetime functions of your TUXEDO computer. <x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/><x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>&#10; "/> With 3 premade as well as any number of individually configurable profiles, you have the greatest possible control and adaptability of your TUXEDO device to your needs. <x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/></source>
771-
<target state="needs-adaptation"><x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>"/>
772-
With the TUXEDO Control Center, we have developed a unique tool for you to control and monitor all
773-
safety, performance, energy, comfort, and lifetime functions of your TUXEDO computer.
774-
<x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/><x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>"/>
775-
With 3 premade as well as any number of individually configurable profiles, you have
776-
the greatest possible control and adaptability of your TUXEDO device to your needs.
777-
<x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/></target>
769+
<trans-unit id="cInfoTCCDescriptionTextP1" datatype="html">
770+
<source> With the TUXEDO Control Center, we have developed a unique tool for you to control and monitor all safety, performance, energy, comfort, and lifetime functions of your TUXEDO computer. </source>
771+
<target state="translated"> With the TUXEDO Control Center, we have developed a unique tool for you to control and monitor all safety, performance, energy, comfort, and lifetime functions of your TUXEDO computer. </target>
778772
<context-group purpose="location">
779773
<context context-type="sourcefile">src/ng-app/app/info/info.component.html</context>
780-
<context context-type="linenumber">31,36</context>
774+
<context context-type="linenumber">32,34</context>
775+
</context-group>
776+
</trans-unit>
777+
<trans-unit id="cInfoTCCDescriptionTextP2" datatype="html">
778+
<source> With premade as well as any number of individually configurable profiles, you have the greatest possible control and adaptability of your TUXEDO device to your needs. </source>
779+
<target state="translated"> With premade as well as any number of individually configurable profiles, you have the greatest possible control and adaptability of your TUXEDO device to your needs. </target>
780+
<context-group purpose="location">
781+
<context context-type="sourcefile">src/ng-app/app/info/info.component.html</context>
782+
<context context-type="linenumber">36,38</context>
781783
</context-group>
782784
</trans-unit>
783785
<trans-unit id="89f1f8c98e581f2a72a68620a75c13f132c34b48" datatype="html">
@@ -1960,15 +1962,15 @@ Commercial register number - Part B of the commercial register - 27755
19601962
<target state="translated">This feature is not supported on your model.</target>
19611963
<context-group purpose="location">
19621964
<context context-type="sourcefile">src/ng-app/app/compatibility.service.ts</context>
1963-
<context context-type="linenumber">72</context>
1965+
<context context-type="linenumber">74</context>
19641966
</context-group>
19651967
</trans-unit>
19661968
<trans-unit id="compatibilityMessageNoWebcamSwitch" datatype="html">
19671969
<source>This feature is not supported on your model.</source>
19681970
<target state="translated">This feature is not supported on your model.</target>
19691971
<context-group purpose="location">
19701972
<context context-type="sourcefile">src/ng-app/app/compatibility.service.ts</context>
1971-
<context context-type="linenumber">80</context>
1973+
<context context-type="linenumber">82</context>
19721974
</context-group>
19731975
</trans-unit>
19741976
</body>

0 commit comments

Comments
 (0)