From 0b21effb13781d8901b7249585aee1dd5161e5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Fri, 7 Jun 2024 22:49:18 +0200
Subject: [PATCH 1/3] New Crowdin updates (#606)

* New translations security.en.xlf (Dutch)

* New translations messages.en.xlf (English)

* New translations messages.en.xlf (English)
---
 translations/messages.en.xlf |  4 ++--
 translations/security.nl.xlf | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 translations/security.nl.xlf

diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 023b2543..ea6923ac 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -3587,7 +3587,7 @@ Sub elements will be moved upwards.</target>
       <segment state="translated">
         <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.&lt;br&gt;
-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>
     </unit>
     <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>
       <segment state="translated">
         <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>
     </unit>
     <unit id="A9Ex8CO" name="tfa_google.step.input_code">
diff --git a/translations/security.nl.xlf b/translations/security.nl.xlf
new file mode 100644
index 00000000..8b87c28c
--- /dev/null
+++ b/translations/security.nl.xlf
@@ -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>

From b2059b691087fe70f84e754496fe402b31c621d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Fri, 7 Jun 2024 23:28:59 +0200
Subject: [PATCH 2/3] Use outline-secondary style for the sidebar toggle button

This makes the button a bit more subtle and fixes issue #620 that the button were not visible in darkmode
---
 templates/base.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/base.html.twig b/templates/base.html.twig
index fc224e60..425594c0 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -115,7 +115,7 @@
     </button>
 
     {# 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') }}>
         <i class="fas fa-angle-left"></i>
     </button>

From 92cb9f70a1b51859557eb100df00569876dd3134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sat, 8 Jun 2024 19:23:22 +0200
Subject: [PATCH 3/3] Bumped version to 1.12.1

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 0eed1a29..f8f4f03b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.12.0
+1.12.1