mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2025-06-21 01:25:55 +02:00
Merge branch 'master' into postgres
This commit is contained in:
commit
c620beb965
4 changed files with 21 additions and 4 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
1.12.0
|
1.12.1
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{# Must be outside of the sidebar or it will be hidden too #}
|
{# Must be outside of the sidebar or it will be hidden too #}
|
||||||
<button class="btn btn-outline-dark btn-sm p-0 d-md-block d-none" type="button" id="sidebar-toggle-button" title="{% trans %}sidebar.big.toggle{% endtrans %}"
|
<button class="btn btn-outline-secondary btn-sm p-0 d-md-block d-none" type="button" id="sidebar-toggle-button" title="{% trans %}sidebar.big.toggle{% endtrans %}"
|
||||||
{{ stimulus_controller('common/hide_sidebar') }} {{ stimulus_action('common/hide_sidebar', 'toggleSidebar') }}>
|
{{ stimulus_controller('common/hide_sidebar') }} {{ stimulus_action('common/hide_sidebar', 'toggleSidebar') }}>
|
||||||
<i class="fas fa-angle-left"></i>
|
<i class="fas fa-angle-left"></i>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -3587,7 +3587,7 @@ Sub elements will be moved upwards.</target>
|
||||||
<segment state="translated">
|
<segment state="translated">
|
||||||
<source>tfa_google.disable.confirm_message</source>
|
<source>tfa_google.disable.confirm_message</source>
|
||||||
<target>If you disable the Authenticator App, all backup codes will be deleted, so you may need to reprint them.<br>
|
<target>If you disable the Authenticator App, all backup codes will be deleted, so you may need to reprint them.<br>
|
||||||
Also note that without two-factor authentication your account is not as well protected against attackers!</target>
|
Also note that without two-factor authentication, your account is no longer as well protected against attackers!</target>
|
||||||
</segment>
|
</segment>
|
||||||
</unit>
|
</unit>
|
||||||
<unit id="VYOAO2c" name="tfa_google.disabled_message">
|
<unit id="VYOAO2c" name="tfa_google.disabled_message">
|
||||||
|
@ -3617,7 +3617,7 @@ Also note that without two-factor authentication your account is not as well pro
|
||||||
</notes>
|
</notes>
|
||||||
<segment state="translated">
|
<segment state="translated">
|
||||||
<source>tfa_google.step.scan</source>
|
<source>tfa_google.step.scan</source>
|
||||||
<target>Scan the adjoining QR Code with the app or enter the data manually</target>
|
<target>Scan the adjacent QR Code with the app or enter the data manually</target>
|
||||||
</segment>
|
</segment>
|
||||||
</unit>
|
</unit>
|
||||||
<unit id="A9Ex8CO" name="tfa_google.step.input_code">
|
<unit id="A9Ex8CO" name="tfa_google.step.input_code">
|
||||||
|
|
17
translations/security.nl.xlf
Normal file
17
translations/security.nl.xlf
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0" srcLang="en" trgLang="nl">
|
||||||
|
<file id="security.en">
|
||||||
|
<unit id="aazoCks" name="user.login_error.user_disabled">
|
||||||
|
<segment state="translated">
|
||||||
|
<source>user.login_error.user_disabled</source>
|
||||||
|
<target>Uw account is gedeactiveerd! Neem contact op met een beheerder indien dit incorrect is.</target>
|
||||||
|
</segment>
|
||||||
|
</unit>
|
||||||
|
<unit id="Dpb9AmY" name="saml.error.cannot_login_local_user_per_saml">
|
||||||
|
<segment state="translated">
|
||||||
|
<source>saml.error.cannot_login_local_user_per_saml</source>
|
||||||
|
<target>U kunt niet inloggen als lokale gebruiker met SSO! Gebruik uw lokale wachtwoord.</target>
|
||||||
|
</segment>
|
||||||
|
</unit>
|
||||||
|
</file>
|
||||||
|
</xliff>
|
Loading…
Add table
Add a link
Reference in a new issue