diff --git a/aleksis/core/locale/ar/LC_MESSAGES/django.po b/aleksis/core/locale/ar/LC_MESSAGES/django.po
index 0c841f397f7272dec10e501c103a069b11e51f3b..fb1798fff0394bf91072242e77249e8c1ec34ba4 100644
--- a/aleksis/core/locale/ar/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AlekSIS (School Information System) 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-15 20:00+0100\n"
+"POT-Creation-Date: 2023-02-27 13:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1154,15 +1154,15 @@ msgstr ""
 msgid "Country for phone number parsing"
 msgstr ""
 
-#: aleksis/core/settings.py:544
+#: aleksis/core/settings.py:549
 msgid "English"
 msgstr ""
 
-#: aleksis/core/settings.py:545
+#: aleksis/core/settings.py:550
 msgid "German"
 msgstr ""
 
-#: aleksis/core/settings.py:546
+#: aleksis/core/settings.py:551
 msgid "Ukrainian"
 msgstr ""
 
@@ -1234,19 +1234,6 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: aleksis/core/templates/503.html:10
-msgid ""
-"The maintenance mode is currently enabled. Please try again\n"
-"          later."
-msgstr ""
-
-#: aleksis/core/templates/503.html:13
-msgid ""
-"\n"
-"            This page is currently unavailable. If this error persists, contact your site administrators:\n"
-"          "
-msgstr ""
-
 #: aleksis/core/templates/account/account_inactive.html:5
 #: aleksis/core/templates/account/account_inactive.html:6
 msgid "Account inactive"
@@ -1331,7 +1318,7 @@ msgstr ""
 #: aleksis/core/templates/account/password_reset_done.html:5
 #: aleksis/core/templates/account/verification_email_required.html:5
 #: aleksis/core/templates/account/verification_email_required.html:6
-#: aleksis/core/templates/two_factor/core/login.html:100
+#: aleksis/core/templates/two_factor/core/login.html:110
 msgid "Reset password"
 msgstr ""
 
@@ -1976,6 +1963,13 @@ msgid ""
 "    "
 msgstr ""
 
+#: aleksis/core/templates/core/partials/splash_screen.html:17
+msgid ""
+"\n"
+"      The maintenance mode is currently enabled. Please try again later.\n"
+"    "
+msgstr ""
+
 #: aleksis/core/templates/core/perms/assign.html:12
 #: aleksis/core/templates/core/perms/assign.html:13
 msgid "Assign permission"
@@ -2494,15 +2488,12 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/_base_focus.html:6
-#: aleksis/core/templates/two_factor/core/otp_required.html:22
-#: aleksis/core/templates/two_factor/core/setup.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:88
+#: aleksis/core/templates/two_factor/core/otp_required.html:19
 msgid "Enable Two-Factor Authentication"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:5
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:46
 msgid "Backup Tokens"
 msgstr ""
 
@@ -2537,35 +2528,35 @@ msgid "Generate Tokens"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/login.html:6
-#: aleksis/core/templates/two_factor/core/login.html:32
-#: aleksis/core/templates/two_factor/core/login.html:95
+#: aleksis/core/templates/two_factor/core/login.html:36
+#: aleksis/core/templates/two_factor/core/login.html:105
 msgid "Login"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:27
+#: aleksis/core/templates/two_factor/core/login.html:31
 #, python-format
 msgid "Login for %(name)s"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:30
+#: aleksis/core/templates/two_factor/core/login.html:34
 msgid "Login with username and password"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:38
+#: aleksis/core/templates/two_factor/core/login.html:42
 msgid ""
 "You have no permission to view this page. Please login with an other\n"
 "                    account."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:47
+#: aleksis/core/templates/two_factor/core/login.html:51
 msgid "Please login with your account to use the external application."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:54
+#: aleksis/core/templates/two_factor/core/login.html:58
 msgid "Please login to see this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:65
+#: aleksis/core/templates/two_factor/core/login.html:69
 msgid ""
 "\n"
 "                        We are calling your phone right now, please enter the\n"
@@ -2573,23 +2564,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:70
+#: aleksis/core/templates/two_factor/core/login.html:74
+msgid ""
+"\n"
+"                        We sent you a text message, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:78
+msgid ""
+"\n"
+"                        We sent you an email, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:82
 msgid ""
 "\n"
-"                        We sent you a text message, please enter the tokens we\n"
-"                        sent.\n"
+"                        Please use your Webauthn-compatible device to authenticate.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:75
+#: aleksis/core/templates/two_factor/core/login.html:86
 msgid ""
 "\n"
-"                        Please enter the tokens generated by your token\n"
-"                        generator.\n"
+"                        Please enter the code generated by your code generator.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:81
+#: aleksis/core/templates/two_factor/core/login.html:91
 msgid ""
 "\n"
 "                      Use this form for entering backup tokens for logging in.\n"
@@ -2598,23 +2601,23 @@ msgid ""
 "                    "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:109
+#: aleksis/core/templates/two_factor/core/login.html:119
 msgid "Device currently not available?"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:111
-msgid "Or, alternatively, use one of your backup phones:"
+#: aleksis/core/templates/two_factor/core/login.html:121
+msgid "Alternatively, use one of your other authentication methods:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:122
+#: aleksis/core/templates/two_factor/core/login.html:133
 msgid "As a last resort, you can use a backup token:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:125
+#: aleksis/core/templates/two_factor/core/login.html:136
 msgid "Use Backup Token"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:136
+#: aleksis/core/templates/two_factor/core/login.html:147
 msgid "Use alternative login options"
 msgstr ""
 
@@ -2624,19 +2627,12 @@ msgstr ""
 
 #: aleksis/core/templates/two_factor/core/otp_required.html:10
 msgid ""
-"The page you requested, enforces users to verify using\n"
-"          two-factor authentication for security reasons. You need to enable these\n"
-"          security features in order to access this page."
+"The page you requested enforces users to verify using\n"
+"          two-factor authentication for security reasons. You need to enable this\n"
+"          security feature in order to access this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/otp_required.html:14
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-"          account. Enable two-factor authentication for enhanced account\n"
-"          security."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/core/otp_required.html:19
+#: aleksis/core/templates/two_factor/core/otp_required.html:16
 msgid "Go back"
 msgstr ""
 
@@ -2659,31 +2655,35 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/setup.html:9
+msgid "Add Two-Factor Authentication Method"
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:13
 msgid ""
 "\n"
 "        You are about to take your account security to the\n"
-"        next level. Follow the steps in this wizard to enable two-factor\n"
-"        authentication.\n"
+"        next level. Follow the steps in this wizard to add\n"
+"        a two-factor authentication method to your account.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:17
+#: aleksis/core/templates/two_factor/core/setup.html:21
 msgid ""
 "\n"
 "        Please select which authentication method you would like to use:\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:23
+#: aleksis/core/templates/two_factor/core/setup.html:27
 msgid ""
 "\n"
-"        To start using a token generator, please use your\n"
-"        favourite two factor authentication (TOTP) app to scan the QR code below.\n"
-"        Then, enter the token generated by the app.\n"
+"        To start using a code generator, please use your\n"
+"        favourite two-factor authentication (TOTP) app to scan the QR code below.\n"
+"        Then enter the token generated by the app.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:34
+#: aleksis/core/templates/two_factor/core/setup.html:38
 msgid ""
 "\n"
 "        Please enter the phone number you wish to receive the\n"
@@ -2691,7 +2691,7 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:41
+#: aleksis/core/templates/two_factor/core/setup.html:45
 msgid ""
 "\n"
 "        Please enter the phone number you wish to be called on.\n"
@@ -2699,21 +2699,28 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:50
+#: aleksis/core/templates/two_factor/core/setup.html:52
+msgid ""
+"\n"
+"        We sent you an email, please enter the token we sent.\n"
+"      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:60
 msgid ""
 "\n"
 "            We are calling your phone right now, please enter the digits you hear.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:56
+#: aleksis/core/templates/two_factor/core/setup.html:66
 msgid ""
 "\n"
-"            We sent you a text message, please enter the tokens we sent.\n"
+"            We sent you a text message, please enter the code we sent.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:63
+#: aleksis/core/templates/two_factor/core/setup.html:73
 msgid ""
 "\n"
 "          We've encountered an issue with the selected authentication method. Please\n"
@@ -2723,7 +2730,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:73
+#: aleksis/core/templates/two_factor/core/setup.html:83
 msgid ""
 "\n"
 "        To identify and verify your YubiKey, please insert a\n"
@@ -2737,41 +2744,38 @@ msgstr ""
 msgid "Two-Factor Authentication successfully enabled"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:14
+#: aleksis/core/templates/two_factor/core/setup_complete.html:13
 msgid ""
 "\n"
 "        Congratulations, you've successfully enabled two-factor authentication.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:24
-#: aleksis/core/templates/two_factor/core/setup_complete.html:44
+#: aleksis/core/templates/two_factor/core/setup_complete.html:22
+#: aleksis/core/templates/two_factor/core/setup_complete.html:40
 msgid "Back to Profile"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:28
-#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+#: aleksis/core/templates/two_factor/core/setup_complete.html:26
+#: aleksis/core/templates/two_factor/core/setup_complete.html:44
 msgid "Generate backup codes"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:34
+#: aleksis/core/templates/two_factor/core/setup_complete.html:31
 msgid ""
 "\n"
 "          However, it might happen that you don't have access to\n"
-"          your primary token device. To enable account recovery, generate backup codes\n"
-"          or add a phone number.\n"
+"          your primary device. To enable account recovery, generate backup codes\n"
+"          or add other authentication methods.\n"
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:52
-#: aleksis/core/templates/two_factor/profile/profile.html:41
-msgid "Add Phone Number"
+#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+msgid "Add Another Authentication Method"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/profile/disable.html:5
 #: aleksis/core/templates/two_factor/profile/disable.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:63
-#: aleksis/core/templates/two_factor/profile/profile.html:73
 msgid "Disable Two-Factor Authentication"
 msgstr ""
 
@@ -2783,82 +2787,6 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/profile/profile.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:10
-msgid "Account Security"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:15
-msgid "Tokens will be generated by your token generator."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:17
-#, python-format
-msgid "Primary method: %(primary)s"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:19
-msgid "Tokens will be generated by your YubiKey."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:23
-msgid "Backup Phone Numbers"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:24
-msgid ""
-"If your primary method is not available, we are able to\n"
-"        send backup tokens to the phone numbers listed below."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:33
-msgid "Unregister"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:48
-msgid ""
-"If you don't have any device with you, you can access\n"
-"        your account using backup tokens."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:50
-#, python-format
-msgid ""
-"\n"
-"        You have only one backup token remaining.\n"
-"      "
-msgid_plural ""
-"\n"
-"        You have %(counter)s backup tokens remaining.\n"
-"      "
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:59
-msgid "Show Codes"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:65
-msgid ""
-"\n"
-"        However we strongly discourage you to do so, you can\n"
-"        also disable two-factor authentication for your account.\n"
-"      "
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:78
-msgid ""
-"\n"
-"        Two-factor authentication is not enabled for your\n"
-"        account. Enable two-factor authentication for enhanced account\n"
-"        security.\n"
-"      "
-msgstr ""
-
 #: aleksis/core/util/notifications.py:64
 msgid "E-Mail"
 msgstr ""
@@ -2887,148 +2815,148 @@ msgstr ""
 msgid "Download PDF"
 msgstr ""
 
-#: aleksis/core/views.py:278
+#: aleksis/core/views.py:280
 msgid "The school term has been created."
 msgstr ""
 
-#: aleksis/core/views.py:290
+#: aleksis/core/views.py:292
 msgid "The school term has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:394
+#: aleksis/core/views.py:396
 msgid "The child groups were successfully saved."
 msgstr ""
 
-#: aleksis/core/views.py:413 aleksis/core/views.py:423
+#: aleksis/core/views.py:415 aleksis/core/views.py:425
 msgid "The person has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:473
+#: aleksis/core/views.py:475
 msgid "The group has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:556
+#: aleksis/core/views.py:558
 msgid "The announcement has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:572
+#: aleksis/core/views.py:574
 msgid "The announcement has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:641
+#: aleksis/core/views.py:643
 msgid "The requested preference registry does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:660
+#: aleksis/core/views.py:662
 msgid "The preferences have been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:684
+#: aleksis/core/views.py:686
 msgid "The person has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:698
+#: aleksis/core/views.py:700
 msgid "The group has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:730
+#: aleksis/core/views.py:732
 msgid "The additional field has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:765
+#: aleksis/core/views.py:767
 msgid "The additional field has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:790
+#: aleksis/core/views.py:792
 msgid "The group type has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:821
+#: aleksis/core/views.py:823
 msgid "The group type has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:856
+#: aleksis/core/views.py:858
 msgid "Progress: Run data checks"
 msgstr ""
 
-#: aleksis/core/views.py:857
+#: aleksis/core/views.py:859
 msgid "Run data checks …"
 msgstr ""
 
-#: aleksis/core/views.py:858
+#: aleksis/core/views.py:860
 msgid "The data checks were run successfully."
 msgstr ""
 
-#: aleksis/core/views.py:859
+#: aleksis/core/views.py:861
 msgid "There was a problem while running data checks."
 msgstr ""
 
-#: aleksis/core/views.py:876
+#: aleksis/core/views.py:878
 #, python-brace-format
 msgid "The solve option '{solve_option_obj.verbose_name}' "
 msgstr ""
 
-#: aleksis/core/views.py:886
+#: aleksis/core/views.py:888
 msgid "The requested solve option does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:919
+#: aleksis/core/views.py:921
 msgid "The dashboard widget has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:949
+#: aleksis/core/views.py:951
 msgid "The dashboard widget has been created."
 msgstr ""
 
-#: aleksis/core/views.py:959
+#: aleksis/core/views.py:961
 msgid "The dashboard widget has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1031
+#: aleksis/core/views.py:1033
 msgid "Your dashboard configuration has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1033
+#: aleksis/core/views.py:1035
 msgid "The configuration of the default dashboard has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1104
+#: aleksis/core/views.py:1106
 #, python-brace-format
 msgid "The invitation was successfully created. The invitation code is {code}"
 msgstr ""
 
-#: aleksis/core/views.py:1201
+#: aleksis/core/views.py:1203
 msgid "We have successfully assigned the permissions."
 msgstr ""
 
-#: aleksis/core/views.py:1211
+#: aleksis/core/views.py:1213
 msgid "The global user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1221
+#: aleksis/core/views.py:1223
 msgid "The global group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1231
+#: aleksis/core/views.py:1233
 msgid "The object user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1241
+#: aleksis/core/views.py:1243
 msgid "The object group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1350
+#: aleksis/core/views.py:1352
 msgid "The third-party account could not be disconnected because it is the only login method available."
 msgstr ""
 
-#: aleksis/core/views.py:1357
+#: aleksis/core/views.py:1359
 msgid "The third-party account has been successfully disconnected."
 msgstr ""
 
-#: aleksis/core/views.py:1433
+#: aleksis/core/views.py:1435
 msgid "Person was invited successfully and an email with further instructions has been send to them."
 msgstr ""
 
-#: aleksis/core/views.py:1444
+#: aleksis/core/views.py:1446
 msgid "Person was already invited."
 msgstr ""
diff --git a/aleksis/core/locale/de_DE/LC_MESSAGES/django.po b/aleksis/core/locale/de_DE/LC_MESSAGES/django.po
index ec7c990b8b51e1db438b7599911f3c1ce32b8807..d5da39be87e2e7b0525ff3adfd98c109acb8efc6 100644
--- a/aleksis/core/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/de_DE/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AlekSIS (School Information System) 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-15 20:00+0100\n"
-"PO-Revision-Date: 2023-01-22 20:05+0000\n"
+"POT-Creation-Date: 2023-02-27 13:23+0100\n"
+"PO-Revision-Date: 2023-02-27 12:57+0000\n"
 "Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
 "Language-Team: German <https://translate.edugit.org/projects/aleksis/aleksis-core/de/>\n"
 "Language: de_DE\n"
@@ -1154,15 +1154,15 @@ msgstr "Automatisch das Dashboard und seine Widgets aktualisieren (auf der ganze
 msgid "Country for phone number parsing"
 msgstr "Land für das Einlesen von Telefonnummern"
 
-#: aleksis/core/settings.py:544
+#: aleksis/core/settings.py:549
 msgid "English"
 msgstr "Englisch"
 
-#: aleksis/core/settings.py:545
+#: aleksis/core/settings.py:550
 msgid "German"
 msgstr "Deutsch"
 
-#: aleksis/core/settings.py:546
+#: aleksis/core/settings.py:551
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
@@ -1250,24 +1250,6 @@ msgstr ""
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: aleksis/core/templates/503.html:10
-msgid ""
-"The maintenance mode is currently enabled. Please try again\n"
-"          later."
-msgstr ""
-"Der Wartungsmodus ist aktuell aktiviert. Bitte versuchen Sie es\n"
-"            später erneut."
-
-#: aleksis/core/templates/503.html:13
-msgid ""
-"\n"
-"            This page is currently unavailable. If this error persists, contact your site administrators:\n"
-"          "
-msgstr ""
-"\n"
-"            Diese Seite ist aktuell nicht erreichbar. Wenn dieser Fehler bestehen bleibt, kontaktieren Sie bitte einen Ihrer Systemadministratoren:\n"
-"          "
-
 #: aleksis/core/templates/account/account_inactive.html:5
 #: aleksis/core/templates/account/account_inactive.html:6
 msgid "Account inactive"
@@ -1360,7 +1342,7 @@ msgstr ""
 #: aleksis/core/templates/account/password_reset_done.html:5
 #: aleksis/core/templates/account/verification_email_required.html:5
 #: aleksis/core/templates/account/verification_email_required.html:6
-#: aleksis/core/templates/two_factor/core/login.html:100
+#: aleksis/core/templates/two_factor/core/login.html:110
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
@@ -2099,6 +2081,16 @@ msgstr ""
 "      Dieser Webbrowser unterstützt kein JavaScript oder die Ausführung wurde blockiert. Bitte nutzen Sie einen anderen Browser, um fortzufahren.\n"
 "    "
 
+#: aleksis/core/templates/core/partials/splash_screen.html:17
+msgid ""
+"\n"
+"      The maintenance mode is currently enabled. Please try again later.\n"
+"    "
+msgstr ""
+"\n"
+"      Der Wartungsmodus ist aktuell aktiviert. Bitte versuchen Sie es später erneut.\n"
+"    "
+
 #: aleksis/core/templates/core/perms/assign.html:12
 #: aleksis/core/templates/core/perms/assign.html:13
 msgid "Assign permission"
@@ -2659,15 +2651,12 @@ msgstr ""
 "  "
 
 #: aleksis/core/templates/two_factor/_base_focus.html:6
-#: aleksis/core/templates/two_factor/core/otp_required.html:22
-#: aleksis/core/templates/two_factor/core/setup.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:88
+#: aleksis/core/templates/two_factor/core/otp_required.html:19
 msgid "Enable Two-Factor Authentication"
 msgstr "Zwei-Faktor-Authentifizierung aktivieren"
 
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:5
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:46
 msgid "Backup Tokens"
 msgstr "Backup-Token"
 
@@ -2711,21 +2700,21 @@ msgid "Generate Tokens"
 msgstr "Tokens generieren"
 
 #: aleksis/core/templates/two_factor/core/login.html:6
-#: aleksis/core/templates/two_factor/core/login.html:32
-#: aleksis/core/templates/two_factor/core/login.html:95
+#: aleksis/core/templates/two_factor/core/login.html:36
+#: aleksis/core/templates/two_factor/core/login.html:105
 msgid "Login"
 msgstr "Anmelden"
 
-#: aleksis/core/templates/two_factor/core/login.html:27
+#: aleksis/core/templates/two_factor/core/login.html:31
 #, python-format
 msgid "Login for %(name)s"
 msgstr "Anmelden für %(name)s"
 
-#: aleksis/core/templates/two_factor/core/login.html:30
+#: aleksis/core/templates/two_factor/core/login.html:34
 msgid "Login with username and password"
 msgstr "Anmeldung mit Benutzername und Passwort"
 
-#: aleksis/core/templates/two_factor/core/login.html:38
+#: aleksis/core/templates/two_factor/core/login.html:42
 msgid ""
 "You have no permission to view this page. Please login with an other\n"
 "                    account."
@@ -2733,15 +2722,15 @@ msgstr ""
 "Sie haben keine Berichtigung, um diese Seite aufzurufen. \n"
 "Bitte loggen Sie sich mit einem anderen Account ein."
 
-#: aleksis/core/templates/two_factor/core/login.html:47
+#: aleksis/core/templates/two_factor/core/login.html:51
 msgid "Please login with your account to use the external application."
 msgstr "Bitte melden Sie sich mit Ihrem Konto an, um die externe Anwendung zu benutzen."
 
-#: aleksis/core/templates/two_factor/core/login.html:54
+#: aleksis/core/templates/two_factor/core/login.html:58
 msgid "Please login to see this page."
 msgstr "Bitte melden Sie sich an, um diese Seite zu sehen."
 
-#: aleksis/core/templates/two_factor/core/login.html:65
+#: aleksis/core/templates/two_factor/core/login.html:69
 msgid ""
 "\n"
 "                        We are calling your phone right now, please enter the\n"
@@ -2753,31 +2742,50 @@ msgstr ""
 "            bitte geben Sie die Zahlen ein, die Sie hören.\n"
 "                      "
 
-#: aleksis/core/templates/two_factor/core/login.html:70
+#: aleksis/core/templates/two_factor/core/login.html:74
+msgid ""
+"\n"
+"                        We sent you a text message, please enter the code we sent.\n"
+"                      "
+msgstr ""
+"\n"
+"                        Wir haben Ihnen eine SMS geschickt, \n"
+"            bitte geben Sie den Code ein, den wir geschickt haben.\n"
+"                      "
+
+#: aleksis/core/templates/two_factor/core/login.html:78
 msgid ""
 "\n"
-"                        We sent you a text message, please enter the tokens we\n"
-"                        sent.\n"
+"                        We sent you an email, please enter the code we sent.\n"
 "                      "
 msgstr ""
 "\n"
 "                        Wir haben Ihnen eine SMS geschickt, \n"
-"            bitte geben Sie die Token ein, die wir geschickt haben.\n"
+"            bitte geben Sie den Code ein, den wir geschickt haben.\n"
 "                      "
 
-#: aleksis/core/templates/two_factor/core/login.html:75
+#: aleksis/core/templates/two_factor/core/login.html:82
 msgid ""
 "\n"
-"                        Please enter the tokens generated by your token\n"
-"                        generator.\n"
+"                        Please use your Webauthn-compatible device to authenticate.\n"
 "                      "
 msgstr ""
 "\n"
-"                        Bitte geben Sie den von Ihrem Token-Generator\n"
-"              generierten Token ein.\n"
+"                        Bitte nutzen Sie Ihr Webauthn-kompatibles Gerät, um sich zu authentifizieren.\n"
 "                      "
 
-#: aleksis/core/templates/two_factor/core/login.html:81
+#: aleksis/core/templates/two_factor/core/login.html:86
+msgid ""
+"\n"
+"                        Please enter the code generated by your code generator.\n"
+"                      "
+msgstr ""
+"\n"
+"                        Bitte geben Sie den von Ihrem Code-Generator\n"
+"              generierten Code ein.\n"
+"                      "
+
+#: aleksis/core/templates/two_factor/core/login.html:91
 msgid ""
 "\n"
 "                      Use this form for entering backup tokens for logging in.\n"
@@ -2791,23 +2799,23 @@ msgstr ""
 "                geben Sie einen dieser Tokens ein, um sich einzuloggen.\n"
 "                    "
 
-#: aleksis/core/templates/two_factor/core/login.html:109
+#: aleksis/core/templates/two_factor/core/login.html:119
 msgid "Device currently not available?"
 msgstr "Gerät aktuell nicht verfügbar?"
 
-#: aleksis/core/templates/two_factor/core/login.html:111
-msgid "Or, alternatively, use one of your backup phones:"
-msgstr "Oder, alternativ, nutzen Sie eins Ihrer Backup-Telefone:"
+#: aleksis/core/templates/two_factor/core/login.html:121
+msgid "Alternatively, use one of your other authentication methods:"
+msgstr "Nutzen Sie alternativ eine Ihrer anderen Authentifizierungsmethoden:"
 
-#: aleksis/core/templates/two_factor/core/login.html:122
+#: aleksis/core/templates/two_factor/core/login.html:133
 msgid "As a last resort, you can use a backup token:"
 msgstr "Als letzte Möglichkeit können Sie einen Backup-Token nutzen:"
 
-#: aleksis/core/templates/two_factor/core/login.html:125
+#: aleksis/core/templates/two_factor/core/login.html:136
 msgid "Use Backup Token"
 msgstr "Backup-Token nutzen"
 
-#: aleksis/core/templates/two_factor/core/login.html:136
+#: aleksis/core/templates/two_factor/core/login.html:147
 msgid "Use alternative login options"
 msgstr "Alternative Anmeldemöglichkeiten nutzen"
 
@@ -2817,25 +2825,15 @@ msgstr "Zugriff verwehrt"
 
 #: aleksis/core/templates/two_factor/core/otp_required.html:10
 msgid ""
-"The page you requested, enforces users to verify using\n"
-"          two-factor authentication for security reasons. You need to enable these\n"
-"          security features in order to access this page."
+"The page you requested enforces users to verify using\n"
+"          two-factor authentication for security reasons. You need to enable this\n"
+"          security feature in order to access this page."
 msgstr ""
 "Die von Ihnen gewünschte Seite erfordert aus Sicherheitsgründen\n"
 "          eine Verifizierung durch Zwei-Faktor-Authentifizierung. Sie müssen diese\n"
-"          Sicherheitsfunktion aktivieren, um diese Seite aufzurufen."
-
-#: aleksis/core/templates/two_factor/core/otp_required.html:14
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-"          account. Enable two-factor authentication for enhanced account\n"
-"          security."
-msgstr ""
-"Die Zwei-Faktor-Authentifizierung ist nicht für Ihren Account aktiviert.\n"
-"          Aktivieren Sie Zwei-Faktor-Authentifizierung für eine verbesserte\n"
-"          Accountsicherheit."
+"          Sicherheitsfunktion aktivieren, um die Seite aufzurufen."
 
-#: aleksis/core/templates/two_factor/core/otp_required.html:19
+#: aleksis/core/templates/two_factor/core/otp_required.html:16
 msgid "Go back"
 msgstr "Zurück"
 
@@ -2863,20 +2861,24 @@ msgstr ""
 "      Bitte geben Sie diesen Token ein."
 
 #: aleksis/core/templates/two_factor/core/setup.html:9
+msgid "Add Two-Factor Authentication Method"
+msgstr "Zwei-Faktor-Authentifizierungs-Methode hinzufügen"
+
+#: aleksis/core/templates/two_factor/core/setup.html:13
 msgid ""
 "\n"
 "        You are about to take your account security to the\n"
-"        next level. Follow the steps in this wizard to enable two-factor\n"
-"        authentication.\n"
+"        next level. Follow the steps in this wizard to add\n"
+"        a two-factor authentication method to your account.\n"
 "      "
 msgstr ""
 "\n"
-"        Sie sind dabei, Ihre Account-Sicherheit auf das\n"
-"       nächste Level zu erhöhen. Bitte folgen Sie den Schritten im Assistenten, um die\n"
-"       Zwei-Faktor-Authentifizierung zu aktivieren.\n"
+"        Sie sind dabei, Ihre Kontosicherheit auf das\n"
+"       nächste Level zu erhöhen. Bitte folgen Sie den Schritten im Assistenten, um eine\n"
+"       Zwei-Faktor-Authentifizierungs-Methode zu Ihrem Konto hinzuzufügen.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:17
+#: aleksis/core/templates/two_factor/core/setup.html:21
 msgid ""
 "\n"
 "        Please select which authentication method you would like to use:\n"
@@ -2886,21 +2888,21 @@ msgstr ""
 "        Bitte wählen Sie aus, welche Authentifikationsmethode Sie nutzen wollen:\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:23
+#: aleksis/core/templates/two_factor/core/setup.html:27
 msgid ""
 "\n"
-"        To start using a token generator, please use your\n"
-"        favourite two factor authentication (TOTP) app to scan the QR code below.\n"
-"        Then, enter the token generated by the app.\n"
+"        To start using a code generator, please use your\n"
+"        favourite two-factor authentication (TOTP) app to scan the QR code below.\n"
+"        Then enter the token generated by the app.\n"
 "      "
 msgstr ""
 "\n"
-"        Um mit dem Codegenerator zu starten, benutzen Sie bitte Ihre\n"
+"        Um mit dem Code-Generator zu starten, benutzen Sie bitte Ihre favorisierte\n"
 "App für Zwei-Faktor-Authentifizierung (TOTP), um diesen QR-Code zu scannen.\n"
-"Dann geben Sie den in der App angezeigten Code an:\n"
+"Dann geben Sie den in der App angezeigten Code ein:\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:34
+#: aleksis/core/templates/two_factor/core/setup.html:38
 msgid ""
 "\n"
 "        Please enter the phone number you wish to receive the\n"
@@ -2912,7 +2914,7 @@ msgstr ""
 "        an die die SMS-Nachrichten geschickt werden sollen. Diese Nummer wird im nächsten Schritt überprüft.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:41
+#: aleksis/core/templates/two_factor/core/setup.html:45
 msgid ""
 "\n"
 "        Please enter the phone number you wish to be called on.\n"
@@ -2924,7 +2926,17 @@ msgstr ""
 "Diese Nummer wird im nächsten Schritt überprüft.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:50
+#: aleksis/core/templates/two_factor/core/setup.html:52
+msgid ""
+"\n"
+"        We sent you an email, please enter the token we sent.\n"
+"      "
+msgstr ""
+"\n"
+"        Wir haben Ihnen eine E-Mail geschickt, bitte geben Sie den Code ein, den wir geschickt haben.\n"
+"      "
+
+#: aleksis/core/templates/two_factor/core/setup.html:60
 msgid ""
 "\n"
 "            We are calling your phone right now, please enter the digits you hear.\n"
@@ -2934,17 +2946,17 @@ msgstr ""
 "            Wir rufen Ihr Telefon jetzt an, bitte geben Sie die Zahlen ein, die Sie hören.\n"
 "          "
 
-#: aleksis/core/templates/two_factor/core/setup.html:56
+#: aleksis/core/templates/two_factor/core/setup.html:66
 msgid ""
 "\n"
-"            We sent you a text message, please enter the tokens we sent.\n"
+"            We sent you a text message, please enter the code we sent.\n"
 "          "
 msgstr ""
 "\n"
-"            Wir haben Ihnen eine SMS geschickt, bitte geben Sie die Tokens ein, die wir geschickt haben.\n"
+"            Wir haben Ihnen eine SMS geschickt, bitte geben Sie den Code ein, den wir geschickt haben.\n"
 "          "
 
-#: aleksis/core/templates/two_factor/core/setup.html:63
+#: aleksis/core/templates/two_factor/core/setup.html:73
 msgid ""
 "\n"
 "          We've encountered an issue with the selected authentication method. Please\n"
@@ -2960,7 +2972,7 @@ msgstr ""
 "Wenn der Fehler bestehen bleibt, kontaktieren Sie bitte einen der Administratoren.\n"
 "        "
 
-#: aleksis/core/templates/two_factor/core/setup.html:73
+#: aleksis/core/templates/two_factor/core/setup.html:83
 msgid ""
 "\n"
 "        To identify and verify your YubiKey, please insert a\n"
@@ -2979,7 +2991,7 @@ msgstr ""
 msgid "Two-Factor Authentication successfully enabled"
 msgstr "Zwei-Faktor-Authentifizierung erfolgreich aktiviert"
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:14
+#: aleksis/core/templates/two_factor/core/setup_complete.html:13
 msgid ""
 "\n"
 "        Congratulations, you've successfully enabled two-factor authentication.\n"
@@ -2989,39 +3001,36 @@ msgstr ""
 "        Gratulation, Sie haben die Zwei-Faktor-Authentifizierung erfolgreich aktiviert.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:24
-#: aleksis/core/templates/two_factor/core/setup_complete.html:44
+#: aleksis/core/templates/two_factor/core/setup_complete.html:22
+#: aleksis/core/templates/two_factor/core/setup_complete.html:40
 msgid "Back to Profile"
 msgstr "Zurück zum Profil"
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:28
-#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+#: aleksis/core/templates/two_factor/core/setup_complete.html:26
+#: aleksis/core/templates/two_factor/core/setup_complete.html:44
 msgid "Generate backup codes"
 msgstr "Backup-Codes generieren"
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:34
+#: aleksis/core/templates/two_factor/core/setup_complete.html:31
 msgid ""
 "\n"
 "          However, it might happen that you don't have access to\n"
-"          your primary token device. To enable account recovery, generate backup codes\n"
-"          or add a phone number.\n"
+"          your primary device. To enable account recovery, generate backup codes\n"
+"          or add other authentication methods.\n"
 "        "
 msgstr ""
 "\n"
-"          Es kann passieren, dass Sie keinen Zugriff auf Ihren Tokengenerator haben. \n"
-"Um die Wiederherstellung zu aktivieren,\n"
-"generieren Sie Backupcodes oder fügen eine Telefonnummer hinzu.\n"
+"          Es kann passieren, dass Sie keinen Zugriff auf Ihr primäres Gerät haben. \n"
+"Um die Konto-Wiederherstellung zu aktivieren,\n"
+"generieren Sie Backup-Codes oder fügen Sie eine andere Authentifizierungs-Methode hinzu.\n"
 "        "
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:52
-#: aleksis/core/templates/two_factor/profile/profile.html:41
-msgid "Add Phone Number"
-msgstr "Telefonnummer hinzufügen"
+#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+msgid "Add Another Authentication Method"
+msgstr "Eine andere Authentifizierungs-Methode hinzufügen"
 
 #: aleksis/core/templates/two_factor/profile/disable.html:5
 #: aleksis/core/templates/two_factor/profile/disable.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:63
-#: aleksis/core/templates/two_factor/profile/profile.html:73
 msgid "Disable Two-Factor Authentication"
 msgstr "Zwei-Faktor-Authentifizierung deaktiveren"
 
@@ -3033,97 +3042,6 @@ msgstr "Sie sind dabei, Zwei-Faktor-Authentifizierung zu deaktivieren. Das versc
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: aleksis/core/templates/two_factor/profile/profile.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:10
-msgid "Account Security"
-msgstr "Kontosicherheit"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:15
-msgid "Tokens will be generated by your token generator."
-msgstr "Tokens werden von Ihrem Token-Generator generiert."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:17
-#, python-format
-msgid "Primary method: %(primary)s"
-msgstr "Primäre Methode: %(primary)s"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:19
-msgid "Tokens will be generated by your YubiKey."
-msgstr "Tokens werden von Ihrem YubiKey generiert."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:23
-msgid "Backup Phone Numbers"
-msgstr "Backup-Telefonnummern"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:24
-msgid ""
-"If your primary method is not available, we are able to\n"
-"        send backup tokens to the phone numbers listed below."
-msgstr ""
-"Wenn Ihre primäre Methode nicht verfügbar ist, sind wir in der Lage,\n"
-"        Backup-Tokens zu den unten aufgelisteten Telefonnummern zu schicken."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:33
-msgid "Unregister"
-msgstr "Abmelden"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:48
-msgid ""
-"If you don't have any device with you, you can access\n"
-"        your account using backup tokens."
-msgstr ""
-"Wenn Sie keines Ihrer Geräte dabei haben, können Sie sich\n"
-"      mit Backup-Tokens einloggen."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:50
-#, python-format
-msgid ""
-"\n"
-"        You have only one backup token remaining.\n"
-"      "
-msgid_plural ""
-"\n"
-"        You have %(counter)s backup tokens remaining.\n"
-"      "
-msgstr[0] ""
-"\n"
-"        Sie haben keinen Backup-Token übrig.\n"
-"      "
-msgstr[1] ""
-"\n"
-"        Sie haben %(counter)s Backup-Tokens übrig.\n"
-"      "
-
-#: aleksis/core/templates/two_factor/profile/profile.html:59
-msgid "Show Codes"
-msgstr "Codes anzeigen"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:65
-msgid ""
-"\n"
-"        However we strongly discourage you to do so, you can\n"
-"        also disable two-factor authentication for your account.\n"
-"      "
-msgstr ""
-"\n"
-"        Wir raten Ihnen jedoch dringend davon ab.\n"
-"        Sie können jedoch auch die Zwei-Faktor-Authentifizierung für Ihr Konto deaktivieren.\n"
-"      "
-
-#: aleksis/core/templates/two_factor/profile/profile.html:78
-msgid ""
-"\n"
-"        Two-factor authentication is not enabled for your\n"
-"        account. Enable two-factor authentication for enhanced account\n"
-"        security.\n"
-"      "
-msgstr ""
-"\n"
-"        Die Zwei-Faktor-Authentifizierung ist nicht für Ihren Account aktiviert.\n"
-"          Aktivieren Sie Zwei-Faktor-Authentifizierung für eine verbesserte\n"
-"          Accountsicherheit.\n"
-"      "
-
 #: aleksis/core/util/notifications.py:64
 msgid "E-Mail"
 msgstr "E-Mail"
@@ -3152,152 +3070,258 @@ msgstr "Es ist ein Fehler beim Generieren der PDF-Datei aufgetreten."
 msgid "Download PDF"
 msgstr "PDF herunterladen"
 
-#: aleksis/core/views.py:278
+#: aleksis/core/views.py:280
 msgid "The school term has been created."
 msgstr "Das Schuljahr wurde erstellt."
 
-#: aleksis/core/views.py:290
+#: aleksis/core/views.py:292
 msgid "The school term has been saved."
 msgstr "Das Schuljahr wurde gespeichert."
 
-#: aleksis/core/views.py:394
+#: aleksis/core/views.py:396
 msgid "The child groups were successfully saved."
 msgstr "Die Untergruppen wurden gespeichert."
 
-#: aleksis/core/views.py:413 aleksis/core/views.py:423
+#: aleksis/core/views.py:415 aleksis/core/views.py:425
 msgid "The person has been saved."
 msgstr "Die Person wurde gespeichert."
 
-#: aleksis/core/views.py:473
+#: aleksis/core/views.py:475
 msgid "The group has been saved."
 msgstr "Die Gruppe wurde gespeichert."
 
-#: aleksis/core/views.py:556
+#: aleksis/core/views.py:558
 msgid "The announcement has been saved."
 msgstr "Die Ankündigung wurde gespeichert."
 
-#: aleksis/core/views.py:572
+#: aleksis/core/views.py:574
 msgid "The announcement has been deleted."
 msgstr "Ankündigung wurde gelöscht."
 
-#: aleksis/core/views.py:641
+#: aleksis/core/views.py:643
 msgid "The requested preference registry does not exist"
 msgstr "Das angeforderte Einstellungsregister existiert nicht"
 
-#: aleksis/core/views.py:660
+#: aleksis/core/views.py:662
 msgid "The preferences have been saved successfully."
 msgstr "Die Einstellungen wurde gespeichert."
 
-#: aleksis/core/views.py:684
+#: aleksis/core/views.py:686
 msgid "The person has been deleted."
 msgstr "Die Person wurde gelöscht."
 
-#: aleksis/core/views.py:698
+#: aleksis/core/views.py:700
 msgid "The group has been deleted."
 msgstr "Die Gruppe wurde gelöscht."
 
-#: aleksis/core/views.py:730
+#: aleksis/core/views.py:732
 msgid "The additional field has been saved."
 msgstr "Das zusätzliche Feld wurde gespeichert."
 
-#: aleksis/core/views.py:765
+#: aleksis/core/views.py:767
 msgid "The additional field has been deleted."
 msgstr "Das zusätzliche Feld wurde gelöscht."
 
-#: aleksis/core/views.py:790
+#: aleksis/core/views.py:792
 msgid "The group type has been saved."
 msgstr "Der Gruppentyp wurde gespeichert."
 
-#: aleksis/core/views.py:821
+#: aleksis/core/views.py:823
 msgid "The group type has been deleted."
 msgstr "Der Gruppentyp wurde gelöscht."
 
-#: aleksis/core/views.py:856
+#: aleksis/core/views.py:858
 msgid "Progress: Run data checks"
 msgstr "Fortschritt: Datenprüfungen ausführen"
 
-#: aleksis/core/views.py:857
+#: aleksis/core/views.py:859
 msgid "Run data checks …"
 msgstr "Datenprüfungen laufen …"
 
-#: aleksis/core/views.py:858
+#: aleksis/core/views.py:860
 msgid "The data checks were run successfully."
 msgstr "Die Datenprüfungen wurden erfolgreich ausgeführt."
 
-#: aleksis/core/views.py:859
+#: aleksis/core/views.py:861
 msgid "There was a problem while running data checks."
 msgstr "Es gab ein Problem beim Ausführen der Datenprüfungen."
 
-#: aleksis/core/views.py:876
+#: aleksis/core/views.py:878
 #, python-brace-format
 msgid "The solve option '{solve_option_obj.verbose_name}' "
 msgstr "Die Lösungsoption \"{solve_option_obj.verbose_name}\" "
 
-#: aleksis/core/views.py:886
+#: aleksis/core/views.py:888
 msgid "The requested solve option does not exist"
 msgstr "Die angeforderte Lösungsoption existiert nicht"
 
-#: aleksis/core/views.py:919
+#: aleksis/core/views.py:921
 msgid "The dashboard widget has been saved."
 msgstr "Das Dashboard-Widget wurde gespeichert."
 
-#: aleksis/core/views.py:949
+#: aleksis/core/views.py:951
 msgid "The dashboard widget has been created."
 msgstr "Das Dashboard-Widget wurde erstellt."
 
-#: aleksis/core/views.py:959
+#: aleksis/core/views.py:961
 msgid "The dashboard widget has been deleted."
 msgstr "Das Dashboard-Widget wurde gelöscht."
 
-#: aleksis/core/views.py:1031
+#: aleksis/core/views.py:1033
 msgid "Your dashboard configuration has been saved successfully."
 msgstr "Ihre Dashboardkonfiguration wurde erfolgreich gespeichert."
 
-#: aleksis/core/views.py:1033
+#: aleksis/core/views.py:1035
 msgid "The configuration of the default dashboard has been saved successfully."
 msgstr "Die Konfiguration des Standard-Dashboardes wurde erfolgreich gespeichert."
 
-#: aleksis/core/views.py:1104
+#: aleksis/core/views.py:1106
 #, python-brace-format
 msgid "The invitation was successfully created. The invitation code is {code}"
 msgstr "Die Einladung wurde erfolgreich erstellt. Der Einladungscode ist {code}"
 
-#: aleksis/core/views.py:1201
+#: aleksis/core/views.py:1203
 msgid "We have successfully assigned the permissions."
 msgstr "Wir haben die Berechtigungen erfolgreich zugewiesen."
 
-#: aleksis/core/views.py:1211
+#: aleksis/core/views.py:1213
 msgid "The global user permission has been deleted."
 msgstr "Die globale Benutzerberechtigung wurde gelöscht."
 
-#: aleksis/core/views.py:1221
+#: aleksis/core/views.py:1223
 msgid "The global group permission has been deleted."
 msgstr "Die globale Gruppenberechtigung wurde gelöscht."
 
-#: aleksis/core/views.py:1231
+#: aleksis/core/views.py:1233
 msgid "The object user permission has been deleted."
 msgstr "Die Objekt-Benutzerberechtigung wurde gelöscht."
 
-#: aleksis/core/views.py:1241
+#: aleksis/core/views.py:1243
 msgid "The object group permission has been deleted."
 msgstr "Die Objekt-Gruppenberechtigung wurde gelöscht."
 
-#: aleksis/core/views.py:1350
+#: aleksis/core/views.py:1352
 msgid "The third-party account could not be disconnected because it is the only login method available."
 msgstr "Das Drittanbieter-Konto konnte nicht deaktiviert werden, weil es die einzige verfügbare Anmeldeoption ist."
 
-#: aleksis/core/views.py:1357
+#: aleksis/core/views.py:1359
 msgid "The third-party account has been successfully disconnected."
 msgstr "Das Drittanbieter-Konto wurde erfolgreich getrennt."
 
-#: aleksis/core/views.py:1433
+#: aleksis/core/views.py:1435
 msgid "Person was invited successfully and an email with further instructions has been send to them."
 msgstr "Die Person wurde erfolgreich eingeladen und eine E-Mail mit weiteren Anweisungen wurde an sie verschickt."
 
-#: aleksis/core/views.py:1444
+#: aleksis/core/views.py:1446
 msgid "Person was already invited."
 msgstr "Person wurde bereits eingeladen."
 
+#~ msgid ""
+#~ "The maintenance mode is currently enabled. Please try again\n"
+#~ "          later."
+#~ msgstr ""
+#~ "Der Wartungsmodus ist aktuell aktiviert. Bitte versuchen Sie es\n"
+#~ "            später erneut."
+
+#~ msgid ""
+#~ "\n"
+#~ "            This page is currently unavailable. If this error persists, contact your site administrators:\n"
+#~ "          "
+#~ msgstr ""
+#~ "\n"
+#~ "            Diese Seite ist aktuell nicht erreichbar. Wenn dieser Fehler bestehen bleibt, kontaktieren Sie bitte einen Ihrer Systemadministratoren:\n"
+#~ "          "
+
+#~ msgid ""
+#~ "Two-factor authentication is not enabled for your\n"
+#~ "          account. Enable two-factor authentication for enhanced account\n"
+#~ "          security."
+#~ msgstr ""
+#~ "Die Zwei-Faktor-Authentifizierung ist nicht für Ihren Account aktiviert.\n"
+#~ "          Aktivieren Sie Zwei-Faktor-Authentifizierung für eine verbesserte\n"
+#~ "          Accountsicherheit."
+
+#~ msgid "Add Phone Number"
+#~ msgstr "Telefonnummer hinzufügen"
+
+#~ msgid "Account Security"
+#~ msgstr "Kontosicherheit"
+
+#~ msgid "Tokens will be generated by your token generator."
+#~ msgstr "Tokens werden von Ihrem Token-Generator generiert."
+
+#, python-format
+#~ msgid "Primary method: %(primary)s"
+#~ msgstr "Primäre Methode: %(primary)s"
+
+#~ msgid "Tokens will be generated by your YubiKey."
+#~ msgstr "Tokens werden von Ihrem YubiKey generiert."
+
+#~ msgid "Backup Phone Numbers"
+#~ msgstr "Backup-Telefonnummern"
+
+#~ msgid ""
+#~ "If your primary method is not available, we are able to\n"
+#~ "        send backup tokens to the phone numbers listed below."
+#~ msgstr ""
+#~ "Wenn Ihre primäre Methode nicht verfügbar ist, sind wir in der Lage,\n"
+#~ "        Backup-Tokens zu den unten aufgelisteten Telefonnummern zu schicken."
+
+#~ msgid "Unregister"
+#~ msgstr "Abmelden"
+
+#~ msgid ""
+#~ "If you don't have any device with you, you can access\n"
+#~ "        your account using backup tokens."
+#~ msgstr ""
+#~ "Wenn Sie keines Ihrer Geräte dabei haben, können Sie sich\n"
+#~ "      mit Backup-Tokens einloggen."
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "        You have only one backup token remaining.\n"
+#~ "      "
+#~ msgid_plural ""
+#~ "\n"
+#~ "        You have %(counter)s backup tokens remaining.\n"
+#~ "      "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "        Sie haben keinen Backup-Token übrig.\n"
+#~ "      "
+#~ msgstr[1] ""
+#~ "\n"
+#~ "        Sie haben %(counter)s Backup-Tokens übrig.\n"
+#~ "      "
+
+#~ msgid "Show Codes"
+#~ msgstr "Codes anzeigen"
+
+#~ msgid ""
+#~ "\n"
+#~ "        However we strongly discourage you to do so, you can\n"
+#~ "        also disable two-factor authentication for your account.\n"
+#~ "      "
+#~ msgstr ""
+#~ "\n"
+#~ "        Wir raten Ihnen jedoch dringend davon ab.\n"
+#~ "        Sie können jedoch auch die Zwei-Faktor-Authentifizierung für Ihr Konto deaktivieren.\n"
+#~ "      "
+
+#~ msgid ""
+#~ "\n"
+#~ "        Two-factor authentication is not enabled for your\n"
+#~ "        account. Enable two-factor authentication for enhanced account\n"
+#~ "        security.\n"
+#~ "      "
+#~ msgstr ""
+#~ "\n"
+#~ "        Die Zwei-Faktor-Authentifizierung ist nicht für Ihren Account aktiviert.\n"
+#~ "          Aktivieren Sie Zwei-Faktor-Authentifizierung für eine verbesserte\n"
+#~ "          Accountsicherheit.\n"
+#~ "      "
+
 #~ msgid "Birthday Calendar"
 #~ msgstr "Geburtstagskalender"
 
@@ -3484,16 +3508,6 @@ msgstr "Person wurde bereits eingeladen."
 #~ msgid "More information about the EUPL"
 #~ msgstr "Weitere Informationen über die EUPL"
 
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "                    This app is licenced under %(licence)s.\n"
-#~ "                  "
-#~ msgstr ""
-#~ "\n"
-#~ "                    Diese App ist unter %(licence)s lizenziert.\n"
-#~ "                  "
-
 #~ msgid ""
 #~ "\n"
 #~ "              Without activated JavaScript the progress status can't be updated.\n"
@@ -3976,15 +3990,6 @@ msgstr "Person wurde bereits eingeladen."
 #~ msgid "Maintenance mode"
 #~ msgstr "Wartungsmodus"
 
-#~ msgid ""
-#~ "\n"
-#~ "     The maintenance mode is currently enabled. Please try again later.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "     Der Wartungsmodus ist aktuell aktiviert. Bitte versuchen Sie es später erneut.\n"
-#~ "    "
-
 #~ msgid "Details"
 #~ msgstr "Details"
 
diff --git a/aleksis/core/locale/fr/LC_MESSAGES/django.po b/aleksis/core/locale/fr/LC_MESSAGES/django.po
index 8925e976a23d950d62a99500c937bed7feb73ac0..225b1a398e823d1b3a053bfd39c4ba7130561b07 100644
--- a/aleksis/core/locale/fr/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AlekSIS (School Information System) 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-15 20:00+0100\n"
+"POT-Creation-Date: 2023-02-27 13:23+0100\n"
 "PO-Revision-Date: 2021-06-16 12:00+0000\n"
 "Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
 "Language-Team: French <https://translate.edugit.org/projects/aleksis/aleksis/fr/>\n"
@@ -1230,15 +1230,15 @@ msgstr ""
 msgid "Country for phone number parsing"
 msgstr ""
 
-#: aleksis/core/settings.py:544
+#: aleksis/core/settings.py:549
 msgid "English"
 msgstr ""
 
-#: aleksis/core/settings.py:545
+#: aleksis/core/settings.py:550
 msgid "German"
 msgstr ""
 
-#: aleksis/core/settings.py:546
+#: aleksis/core/settings.py:551
 msgid "Ukrainian"
 msgstr ""
 
@@ -1310,19 +1310,6 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: aleksis/core/templates/503.html:10
-msgid ""
-"The maintenance mode is currently enabled. Please try again\n"
-"          later."
-msgstr ""
-
-#: aleksis/core/templates/503.html:13
-msgid ""
-"\n"
-"            This page is currently unavailable. If this error persists, contact your site administrators:\n"
-"          "
-msgstr ""
-
 #: aleksis/core/templates/account/account_inactive.html:5
 #: aleksis/core/templates/account/account_inactive.html:6
 msgid "Account inactive"
@@ -1407,7 +1394,7 @@ msgstr ""
 #: aleksis/core/templates/account/password_reset_done.html:5
 #: aleksis/core/templates/account/verification_email_required.html:5
 #: aleksis/core/templates/account/verification_email_required.html:6
-#: aleksis/core/templates/two_factor/core/login.html:100
+#: aleksis/core/templates/two_factor/core/login.html:110
 msgid "Reset password"
 msgstr ""
 
@@ -2064,6 +2051,13 @@ msgid ""
 "    "
 msgstr ""
 
+#: aleksis/core/templates/core/partials/splash_screen.html:17
+msgid ""
+"\n"
+"      The maintenance mode is currently enabled. Please try again later.\n"
+"    "
+msgstr ""
+
 #: aleksis/core/templates/core/perms/assign.html:12
 #: aleksis/core/templates/core/perms/assign.html:13
 msgid "Assign permission"
@@ -2603,15 +2597,12 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/_base_focus.html:6
-#: aleksis/core/templates/two_factor/core/otp_required.html:22
-#: aleksis/core/templates/two_factor/core/setup.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:88
+#: aleksis/core/templates/two_factor/core/otp_required.html:19
 msgid "Enable Two-Factor Authentication"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:5
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:46
 msgid "Backup Tokens"
 msgstr ""
 
@@ -2646,36 +2637,36 @@ msgid "Generate Tokens"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/login.html:6
-#: aleksis/core/templates/two_factor/core/login.html:32
-#: aleksis/core/templates/two_factor/core/login.html:95
+#: aleksis/core/templates/two_factor/core/login.html:36
+#: aleksis/core/templates/two_factor/core/login.html:105
 msgid "Login"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:27
+#: aleksis/core/templates/two_factor/core/login.html:31
 #, fuzzy, python-format
 #| msgid "Contact details"
 msgid "Login for %(name)s"
 msgstr "Détails de contact"
 
-#: aleksis/core/templates/two_factor/core/login.html:30
+#: aleksis/core/templates/two_factor/core/login.html:34
 msgid "Login with username and password"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:38
+#: aleksis/core/templates/two_factor/core/login.html:42
 msgid ""
 "You have no permission to view this page. Please login with an other\n"
 "                    account."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:47
+#: aleksis/core/templates/two_factor/core/login.html:51
 msgid "Please login with your account to use the external application."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:54
+#: aleksis/core/templates/two_factor/core/login.html:58
 msgid "Please login to see this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:65
+#: aleksis/core/templates/two_factor/core/login.html:69
 msgid ""
 "\n"
 "                        We are calling your phone right now, please enter the\n"
@@ -2683,23 +2674,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:70
+#: aleksis/core/templates/two_factor/core/login.html:74
+msgid ""
+"\n"
+"                        We sent you a text message, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:78
+msgid ""
+"\n"
+"                        We sent you an email, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:82
 msgid ""
 "\n"
-"                        We sent you a text message, please enter the tokens we\n"
-"                        sent.\n"
+"                        Please use your Webauthn-compatible device to authenticate.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:75
+#: aleksis/core/templates/two_factor/core/login.html:86
 msgid ""
 "\n"
-"                        Please enter the tokens generated by your token\n"
-"                        generator.\n"
+"                        Please enter the code generated by your code generator.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:81
+#: aleksis/core/templates/two_factor/core/login.html:91
 msgid ""
 "\n"
 "                      Use this form for entering backup tokens for logging in.\n"
@@ -2708,23 +2711,23 @@ msgid ""
 "                    "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:109
+#: aleksis/core/templates/two_factor/core/login.html:119
 msgid "Device currently not available?"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:111
-msgid "Or, alternatively, use one of your backup phones:"
+#: aleksis/core/templates/two_factor/core/login.html:121
+msgid "Alternatively, use one of your other authentication methods:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:122
+#: aleksis/core/templates/two_factor/core/login.html:133
 msgid "As a last resort, you can use a backup token:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:125
+#: aleksis/core/templates/two_factor/core/login.html:136
 msgid "Use Backup Token"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:136
+#: aleksis/core/templates/two_factor/core/login.html:147
 msgid "Use alternative login options"
 msgstr ""
 
@@ -2734,19 +2737,12 @@ msgstr ""
 
 #: aleksis/core/templates/two_factor/core/otp_required.html:10
 msgid ""
-"The page you requested, enforces users to verify using\n"
-"          two-factor authentication for security reasons. You need to enable these\n"
-"          security features in order to access this page."
+"The page you requested enforces users to verify using\n"
+"          two-factor authentication for security reasons. You need to enable this\n"
+"          security feature in order to access this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/otp_required.html:14
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-"          account. Enable two-factor authentication for enhanced account\n"
-"          security."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/core/otp_required.html:19
+#: aleksis/core/templates/two_factor/core/otp_required.html:16
 msgid "Go back"
 msgstr ""
 
@@ -2769,31 +2765,35 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/setup.html:9
+msgid "Add Two-Factor Authentication Method"
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:13
 msgid ""
 "\n"
 "        You are about to take your account security to the\n"
-"        next level. Follow the steps in this wizard to enable two-factor\n"
-"        authentication.\n"
+"        next level. Follow the steps in this wizard to add\n"
+"        a two-factor authentication method to your account.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:17
+#: aleksis/core/templates/two_factor/core/setup.html:21
 msgid ""
 "\n"
 "        Please select which authentication method you would like to use:\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:23
+#: aleksis/core/templates/two_factor/core/setup.html:27
 msgid ""
 "\n"
-"        To start using a token generator, please use your\n"
-"        favourite two factor authentication (TOTP) app to scan the QR code below.\n"
-"        Then, enter the token generated by the app.\n"
+"        To start using a code generator, please use your\n"
+"        favourite two-factor authentication (TOTP) app to scan the QR code below.\n"
+"        Then enter the token generated by the app.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:34
+#: aleksis/core/templates/two_factor/core/setup.html:38
 msgid ""
 "\n"
 "        Please enter the phone number you wish to receive the\n"
@@ -2801,7 +2801,7 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:41
+#: aleksis/core/templates/two_factor/core/setup.html:45
 msgid ""
 "\n"
 "        Please enter the phone number you wish to be called on.\n"
@@ -2809,21 +2809,28 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:50
+#: aleksis/core/templates/two_factor/core/setup.html:52
+msgid ""
+"\n"
+"        We sent you an email, please enter the token we sent.\n"
+"      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:60
 msgid ""
 "\n"
 "            We are calling your phone right now, please enter the digits you hear.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:56
+#: aleksis/core/templates/two_factor/core/setup.html:66
 msgid ""
 "\n"
-"            We sent you a text message, please enter the tokens we sent.\n"
+"            We sent you a text message, please enter the code we sent.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:63
+#: aleksis/core/templates/two_factor/core/setup.html:73
 msgid ""
 "\n"
 "          We've encountered an issue with the selected authentication method. Please\n"
@@ -2833,7 +2840,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:73
+#: aleksis/core/templates/two_factor/core/setup.html:83
 msgid ""
 "\n"
 "        To identify and verify your YubiKey, please insert a\n"
@@ -2847,41 +2854,38 @@ msgstr ""
 msgid "Two-Factor Authentication successfully enabled"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:14
+#: aleksis/core/templates/two_factor/core/setup_complete.html:13
 msgid ""
 "\n"
 "        Congratulations, you've successfully enabled two-factor authentication.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:24
-#: aleksis/core/templates/two_factor/core/setup_complete.html:44
+#: aleksis/core/templates/two_factor/core/setup_complete.html:22
+#: aleksis/core/templates/two_factor/core/setup_complete.html:40
 msgid "Back to Profile"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:28
-#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+#: aleksis/core/templates/two_factor/core/setup_complete.html:26
+#: aleksis/core/templates/two_factor/core/setup_complete.html:44
 msgid "Generate backup codes"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:34
+#: aleksis/core/templates/two_factor/core/setup_complete.html:31
 msgid ""
 "\n"
 "          However, it might happen that you don't have access to\n"
-"          your primary token device. To enable account recovery, generate backup codes\n"
-"          or add a phone number.\n"
+"          your primary device. To enable account recovery, generate backup codes\n"
+"          or add other authentication methods.\n"
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:52
-#: aleksis/core/templates/two_factor/profile/profile.html:41
-msgid "Add Phone Number"
+#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+msgid "Add Another Authentication Method"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/profile/disable.html:5
 #: aleksis/core/templates/two_factor/profile/disable.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:63
-#: aleksis/core/templates/two_factor/profile/profile.html:73
 msgid "Disable Two-Factor Authentication"
 msgstr ""
 
@@ -2893,78 +2897,6 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/profile/profile.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:10
-msgid "Account Security"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:15
-msgid "Tokens will be generated by your token generator."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:17
-#, python-format
-msgid "Primary method: %(primary)s"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:19
-msgid "Tokens will be generated by your YubiKey."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:23
-msgid "Backup Phone Numbers"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:24
-msgid ""
-"If your primary method is not available, we are able to\n"
-"        send backup tokens to the phone numbers listed below."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:33
-msgid "Unregister"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:48
-msgid ""
-"If you don't have any device with you, you can access\n"
-"        your account using backup tokens."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:50
-#, python-format
-msgid ""
-"\n"
-"        You have only one backup token remaining.\n"
-"      "
-msgid_plural ""
-"\n"
-"        You have %(counter)s backup tokens remaining.\n"
-"      "
-msgstr[0] ""
-msgstr[1] ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:59
-msgid "Show Codes"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:65
-msgid ""
-"\n"
-"        However we strongly discourage you to do so, you can\n"
-"        also disable two-factor authentication for your account.\n"
-"      "
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:78
-msgid ""
-"\n"
-"        Two-factor authentication is not enabled for your\n"
-"        account. Enable two-factor authentication for enhanced account\n"
-"        security.\n"
-"      "
-msgstr ""
-
 #: aleksis/core/util/notifications.py:64
 msgid "E-Mail"
 msgstr ""
@@ -2993,149 +2925,149 @@ msgstr ""
 msgid "Download PDF"
 msgstr ""
 
-#: aleksis/core/views.py:278
+#: aleksis/core/views.py:280
 msgid "The school term has been created."
 msgstr ""
 
-#: aleksis/core/views.py:290
+#: aleksis/core/views.py:292
 msgid "The school term has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:394
+#: aleksis/core/views.py:396
 msgid "The child groups were successfully saved."
 msgstr ""
 
-#: aleksis/core/views.py:413 aleksis/core/views.py:423
+#: aleksis/core/views.py:415 aleksis/core/views.py:425
 msgid "The person has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:473
+#: aleksis/core/views.py:475
 msgid "The group has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:556
+#: aleksis/core/views.py:558
 msgid "The announcement has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:572
+#: aleksis/core/views.py:574
 msgid "The announcement has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:641
+#: aleksis/core/views.py:643
 msgid "The requested preference registry does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:660
+#: aleksis/core/views.py:662
 msgid "The preferences have been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:684
+#: aleksis/core/views.py:686
 msgid "The person has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:698
+#: aleksis/core/views.py:700
 msgid "The group has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:730
+#: aleksis/core/views.py:732
 msgid "The additional field has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:765
+#: aleksis/core/views.py:767
 msgid "The additional field has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:790
+#: aleksis/core/views.py:792
 msgid "The group type has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:821
+#: aleksis/core/views.py:823
 msgid "The group type has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:856
+#: aleksis/core/views.py:858
 msgid "Progress: Run data checks"
 msgstr ""
 
-#: aleksis/core/views.py:857
+#: aleksis/core/views.py:859
 msgid "Run data checks …"
 msgstr ""
 
-#: aleksis/core/views.py:858
+#: aleksis/core/views.py:860
 msgid "The data checks were run successfully."
 msgstr ""
 
-#: aleksis/core/views.py:859
+#: aleksis/core/views.py:861
 msgid "There was a problem while running data checks."
 msgstr ""
 
-#: aleksis/core/views.py:876
+#: aleksis/core/views.py:878
 #, python-brace-format
 msgid "The solve option '{solve_option_obj.verbose_name}' "
 msgstr ""
 
-#: aleksis/core/views.py:886
+#: aleksis/core/views.py:888
 msgid "The requested solve option does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:919
+#: aleksis/core/views.py:921
 msgid "The dashboard widget has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:949
+#: aleksis/core/views.py:951
 msgid "The dashboard widget has been created."
 msgstr ""
 
-#: aleksis/core/views.py:959
+#: aleksis/core/views.py:961
 msgid "The dashboard widget has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1031
+#: aleksis/core/views.py:1033
 msgid "Your dashboard configuration has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1033
+#: aleksis/core/views.py:1035
 msgid "The configuration of the default dashboard has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1104
+#: aleksis/core/views.py:1106
 #, python-brace-format
 msgid "The invitation was successfully created. The invitation code is {code}"
 msgstr ""
 
-#: aleksis/core/views.py:1201
+#: aleksis/core/views.py:1203
 msgid "We have successfully assigned the permissions."
 msgstr ""
 
-#: aleksis/core/views.py:1211
+#: aleksis/core/views.py:1213
 msgid "The global user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1221
+#: aleksis/core/views.py:1223
 msgid "The global group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1231
+#: aleksis/core/views.py:1233
 msgid "The object user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1241
+#: aleksis/core/views.py:1243
 msgid "The object group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1350
+#: aleksis/core/views.py:1352
 msgid "The third-party account could not be disconnected because it is the only login method available."
 msgstr ""
 
-#: aleksis/core/views.py:1357
+#: aleksis/core/views.py:1359
 msgid "The third-party account has been successfully disconnected."
 msgstr ""
 
-#: aleksis/core/views.py:1433
+#: aleksis/core/views.py:1435
 msgid "Person was invited successfully and an email with further instructions has been send to them."
 msgstr ""
 
-#: aleksis/core/views.py:1444
+#: aleksis/core/views.py:1446
 #, fuzzy
 #| msgid "This username is already in use."
 msgid "Person was already invited."
diff --git a/aleksis/core/locale/la/LC_MESSAGES/django.po b/aleksis/core/locale/la/LC_MESSAGES/django.po
index 217f324ef5c63ec5c7ed756887188bafa2fb1643..eac7e9fda18c24a985b1eabe0c42196bad449502 100644
--- a/aleksis/core/locale/la/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/la/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-15 20:00+0100\n"
+"POT-Creation-Date: 2023-02-27 13:23+0100\n"
 "PO-Revision-Date: 2020-12-19 12:57+0000\n"
 "Last-Translator: Julian <leuckerj@gmail.com>\n"
 "Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis/la/>\n"
@@ -1286,15 +1286,15 @@ msgstr ""
 msgid "Country for phone number parsing"
 msgstr ""
 
-#: aleksis/core/settings.py:544
+#: aleksis/core/settings.py:549
 msgid "English"
 msgstr "Britannicus"
 
-#: aleksis/core/settings.py:545
+#: aleksis/core/settings.py:550
 msgid "German"
 msgstr "Germanus"
 
-#: aleksis/core/settings.py:546
+#: aleksis/core/settings.py:551
 msgid "Ukrainian"
 msgstr ""
 
@@ -1368,19 +1368,6 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: aleksis/core/templates/503.html:10
-msgid ""
-"The maintenance mode is currently enabled. Please try again\n"
-"          later."
-msgstr ""
-
-#: aleksis/core/templates/503.html:13
-msgid ""
-"\n"
-"            This page is currently unavailable. If this error persists, contact your site administrators:\n"
-"          "
-msgstr ""
-
 #: aleksis/core/templates/account/account_inactive.html:5
 #: aleksis/core/templates/account/account_inactive.html:6
 msgid "Account inactive"
@@ -1467,7 +1454,7 @@ msgstr ""
 #: aleksis/core/templates/account/password_reset_done.html:5
 #: aleksis/core/templates/account/verification_email_required.html:5
 #: aleksis/core/templates/account/verification_email_required.html:6
-#: aleksis/core/templates/two_factor/core/login.html:100
+#: aleksis/core/templates/two_factor/core/login.html:110
 msgid "Reset password"
 msgstr ""
 
@@ -2162,6 +2149,13 @@ msgid ""
 "    "
 msgstr ""
 
+#: aleksis/core/templates/core/partials/splash_screen.html:17
+msgid ""
+"\n"
+"      The maintenance mode is currently enabled. Please try again later.\n"
+"    "
+msgstr ""
+
 #: aleksis/core/templates/core/perms/assign.html:12
 #: aleksis/core/templates/core/perms/assign.html:13
 msgid "Assign permission"
@@ -2722,15 +2716,12 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/_base_focus.html:6
-#: aleksis/core/templates/two_factor/core/otp_required.html:22
-#: aleksis/core/templates/two_factor/core/setup.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:88
+#: aleksis/core/templates/two_factor/core/otp_required.html:19
 msgid "Enable Two-Factor Authentication"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:5
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:46
 msgid "Backup Tokens"
 msgstr ""
 
@@ -2765,36 +2756,36 @@ msgid "Generate Tokens"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/login.html:6
-#: aleksis/core/templates/two_factor/core/login.html:32
-#: aleksis/core/templates/two_factor/core/login.html:95
+#: aleksis/core/templates/two_factor/core/login.html:36
+#: aleksis/core/templates/two_factor/core/login.html:105
 msgid "Login"
 msgstr "nomen profiteri"
 
-#: aleksis/core/templates/two_factor/core/login.html:27
+#: aleksis/core/templates/two_factor/core/login.html:31
 #, fuzzy, python-format
 #| msgid "Stop impersonation"
 msgid "Login for %(name)s"
 msgstr "Simulandum aliquem finire"
 
-#: aleksis/core/templates/two_factor/core/login.html:30
+#: aleksis/core/templates/two_factor/core/login.html:34
 msgid "Login with username and password"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:38
+#: aleksis/core/templates/two_factor/core/login.html:42
 msgid ""
 "You have no permission to view this page. Please login with an other\n"
 "                    account."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:47
+#: aleksis/core/templates/two_factor/core/login.html:51
 msgid "Please login with your account to use the external application."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:54
+#: aleksis/core/templates/two_factor/core/login.html:58
 msgid "Please login to see this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:65
+#: aleksis/core/templates/two_factor/core/login.html:69
 msgid ""
 "\n"
 "                        We are calling your phone right now, please enter the\n"
@@ -2802,23 +2793,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:70
+#: aleksis/core/templates/two_factor/core/login.html:74
+msgid ""
+"\n"
+"                        We sent you a text message, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:78
+msgid ""
+"\n"
+"                        We sent you an email, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:82
 msgid ""
 "\n"
-"                        We sent you a text message, please enter the tokens we\n"
-"                        sent.\n"
+"                        Please use your Webauthn-compatible device to authenticate.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:75
+#: aleksis/core/templates/two_factor/core/login.html:86
 msgid ""
 "\n"
-"                        Please enter the tokens generated by your token\n"
-"                        generator.\n"
+"                        Please enter the code generated by your code generator.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:81
+#: aleksis/core/templates/two_factor/core/login.html:91
 msgid ""
 "\n"
 "                      Use this form for entering backup tokens for logging in.\n"
@@ -2827,23 +2830,23 @@ msgid ""
 "                    "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:109
+#: aleksis/core/templates/two_factor/core/login.html:119
 msgid "Device currently not available?"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:111
-msgid "Or, alternatively, use one of your backup phones:"
+#: aleksis/core/templates/two_factor/core/login.html:121
+msgid "Alternatively, use one of your other authentication methods:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:122
+#: aleksis/core/templates/two_factor/core/login.html:133
 msgid "As a last resort, you can use a backup token:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:125
+#: aleksis/core/templates/two_factor/core/login.html:136
 msgid "Use Backup Token"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:136
+#: aleksis/core/templates/two_factor/core/login.html:147
 msgid "Use alternative login options"
 msgstr ""
 
@@ -2853,19 +2856,12 @@ msgstr ""
 
 #: aleksis/core/templates/two_factor/core/otp_required.html:10
 msgid ""
-"The page you requested, enforces users to verify using\n"
-"          two-factor authentication for security reasons. You need to enable these\n"
-"          security features in order to access this page."
+"The page you requested enforces users to verify using\n"
+"          two-factor authentication for security reasons. You need to enable this\n"
+"          security feature in order to access this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/otp_required.html:14
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-"          account. Enable two-factor authentication for enhanced account\n"
-"          security."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/core/otp_required.html:19
+#: aleksis/core/templates/two_factor/core/otp_required.html:16
 msgid "Go back"
 msgstr ""
 
@@ -2888,31 +2884,35 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/setup.html:9
+msgid "Add Two-Factor Authentication Method"
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:13
 msgid ""
 "\n"
 "        You are about to take your account security to the\n"
-"        next level. Follow the steps in this wizard to enable two-factor\n"
-"        authentication.\n"
+"        next level. Follow the steps in this wizard to add\n"
+"        a two-factor authentication method to your account.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:17
+#: aleksis/core/templates/two_factor/core/setup.html:21
 msgid ""
 "\n"
 "        Please select which authentication method you would like to use:\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:23
+#: aleksis/core/templates/two_factor/core/setup.html:27
 msgid ""
 "\n"
-"        To start using a token generator, please use your\n"
-"        favourite two factor authentication (TOTP) app to scan the QR code below.\n"
-"        Then, enter the token generated by the app.\n"
+"        To start using a code generator, please use your\n"
+"        favourite two-factor authentication (TOTP) app to scan the QR code below.\n"
+"        Then enter the token generated by the app.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:34
+#: aleksis/core/templates/two_factor/core/setup.html:38
 msgid ""
 "\n"
 "        Please enter the phone number you wish to receive the\n"
@@ -2920,7 +2920,7 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:41
+#: aleksis/core/templates/two_factor/core/setup.html:45
 msgid ""
 "\n"
 "        Please enter the phone number you wish to be called on.\n"
@@ -2928,21 +2928,28 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:50
+#: aleksis/core/templates/two_factor/core/setup.html:52
+msgid ""
+"\n"
+"        We sent you an email, please enter the token we sent.\n"
+"      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:60
 msgid ""
 "\n"
 "            We are calling your phone right now, please enter the digits you hear.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:56
+#: aleksis/core/templates/two_factor/core/setup.html:66
 msgid ""
 "\n"
-"            We sent you a text message, please enter the tokens we sent.\n"
+"            We sent you a text message, please enter the code we sent.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:63
+#: aleksis/core/templates/two_factor/core/setup.html:73
 msgid ""
 "\n"
 "          We've encountered an issue with the selected authentication method. Please\n"
@@ -2952,7 +2959,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:73
+#: aleksis/core/templates/two_factor/core/setup.html:83
 msgid ""
 "\n"
 "        To identify and verify your YubiKey, please insert a\n"
@@ -2966,41 +2973,38 @@ msgstr ""
 msgid "Two-Factor Authentication successfully enabled"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:14
+#: aleksis/core/templates/two_factor/core/setup_complete.html:13
 msgid ""
 "\n"
 "        Congratulations, you've successfully enabled two-factor authentication.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:24
-#: aleksis/core/templates/two_factor/core/setup_complete.html:44
+#: aleksis/core/templates/two_factor/core/setup_complete.html:22
+#: aleksis/core/templates/two_factor/core/setup_complete.html:40
 msgid "Back to Profile"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:28
-#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+#: aleksis/core/templates/two_factor/core/setup_complete.html:26
+#: aleksis/core/templates/two_factor/core/setup_complete.html:44
 msgid "Generate backup codes"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:34
+#: aleksis/core/templates/two_factor/core/setup_complete.html:31
 msgid ""
 "\n"
 "          However, it might happen that you don't have access to\n"
-"          your primary token device. To enable account recovery, generate backup codes\n"
-"          or add a phone number.\n"
+"          your primary device. To enable account recovery, generate backup codes\n"
+"          or add other authentication methods.\n"
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:52
-#: aleksis/core/templates/two_factor/profile/profile.html:41
-msgid "Add Phone Number"
+#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+msgid "Add Another Authentication Method"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/profile/disable.html:5
 #: aleksis/core/templates/two_factor/profile/disable.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:63
-#: aleksis/core/templates/two_factor/profile/profile.html:73
 msgid "Disable Two-Factor Authentication"
 msgstr ""
 
@@ -3012,78 +3016,6 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/profile/profile.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:10
-msgid "Account Security"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:15
-msgid "Tokens will be generated by your token generator."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:17
-#, python-format
-msgid "Primary method: %(primary)s"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:19
-msgid "Tokens will be generated by your YubiKey."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:23
-msgid "Backup Phone Numbers"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:24
-msgid ""
-"If your primary method is not available, we are able to\n"
-"        send backup tokens to the phone numbers listed below."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:33
-msgid "Unregister"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:48
-msgid ""
-"If you don't have any device with you, you can access\n"
-"        your account using backup tokens."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:50
-#, python-format
-msgid ""
-"\n"
-"        You have only one backup token remaining.\n"
-"      "
-msgid_plural ""
-"\n"
-"        You have %(counter)s backup tokens remaining.\n"
-"      "
-msgstr[0] ""
-msgstr[1] ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:59
-msgid "Show Codes"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:65
-msgid ""
-"\n"
-"        However we strongly discourage you to do so, you can\n"
-"        also disable two-factor authentication for your account.\n"
-"      "
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:78
-msgid ""
-"\n"
-"        Two-factor authentication is not enabled for your\n"
-"        account. Enable two-factor authentication for enhanced account\n"
-"        security.\n"
-"      "
-msgstr ""
-
 #: aleksis/core/util/notifications.py:64
 msgid "E-Mail"
 msgstr ""
@@ -3112,153 +3044,153 @@ msgstr ""
 msgid "Download PDF"
 msgstr ""
 
-#: aleksis/core/views.py:278
+#: aleksis/core/views.py:280
 msgid "The school term has been created."
 msgstr ""
 
-#: aleksis/core/views.py:290
+#: aleksis/core/views.py:292
 msgid "The school term has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:394
+#: aleksis/core/views.py:396
 msgid "The child groups were successfully saved."
 msgstr ""
 
-#: aleksis/core/views.py:413 aleksis/core/views.py:423
+#: aleksis/core/views.py:415 aleksis/core/views.py:425
 msgid "The person has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:473
+#: aleksis/core/views.py:475
 msgid "The group has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:556
+#: aleksis/core/views.py:558
 msgid "The announcement has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:572
+#: aleksis/core/views.py:574
 msgid "The announcement has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:641
+#: aleksis/core/views.py:643
 msgid "The requested preference registry does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:660
+#: aleksis/core/views.py:662
 msgid "The preferences have been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:684
+#: aleksis/core/views.py:686
 msgid "The person has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:698
+#: aleksis/core/views.py:700
 msgid "The group has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:730
+#: aleksis/core/views.py:732
 #, fuzzy
 #| msgid "Additional name(s)"
 msgid "The additional field has been saved."
 msgstr "addita nomines"
 
-#: aleksis/core/views.py:765
+#: aleksis/core/views.py:767
 msgid "The additional field has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:790
+#: aleksis/core/views.py:792
 msgid "The group type has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:821
+#: aleksis/core/views.py:823
 msgid "The group type has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:856
+#: aleksis/core/views.py:858
 msgid "Progress: Run data checks"
 msgstr ""
 
-#: aleksis/core/views.py:857
+#: aleksis/core/views.py:859
 #, fuzzy
 #| msgid "System status"
 msgid "Run data checks …"
 msgstr "Status systemae"
 
-#: aleksis/core/views.py:858
+#: aleksis/core/views.py:860
 msgid "The data checks were run successfully."
 msgstr ""
 
-#: aleksis/core/views.py:859
+#: aleksis/core/views.py:861
 msgid "There was a problem while running data checks."
 msgstr ""
 
-#: aleksis/core/views.py:876
+#: aleksis/core/views.py:878
 #, python-brace-format
 msgid "The solve option '{solve_option_obj.verbose_name}' "
 msgstr ""
 
-#: aleksis/core/views.py:886
+#: aleksis/core/views.py:888
 msgid "The requested solve option does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:919
+#: aleksis/core/views.py:921
 msgid "The dashboard widget has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:949
+#: aleksis/core/views.py:951
 msgid "The dashboard widget has been created."
 msgstr ""
 
-#: aleksis/core/views.py:959
+#: aleksis/core/views.py:961
 msgid "The dashboard widget has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1031
+#: aleksis/core/views.py:1033
 msgid "Your dashboard configuration has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1033
+#: aleksis/core/views.py:1035
 msgid "The configuration of the default dashboard has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1104
+#: aleksis/core/views.py:1106
 #, python-brace-format
 msgid "The invitation was successfully created. The invitation code is {code}"
 msgstr ""
 
-#: aleksis/core/views.py:1201
+#: aleksis/core/views.py:1203
 msgid "We have successfully assigned the permissions."
 msgstr ""
 
-#: aleksis/core/views.py:1211
+#: aleksis/core/views.py:1213
 msgid "The global user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1221
+#: aleksis/core/views.py:1223
 msgid "The global group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1231
+#: aleksis/core/views.py:1233
 msgid "The object user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1241
+#: aleksis/core/views.py:1243
 msgid "The object group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1350
+#: aleksis/core/views.py:1352
 msgid "The third-party account could not be disconnected because it is the only login method available."
 msgstr ""
 
-#: aleksis/core/views.py:1357
+#: aleksis/core/views.py:1359
 msgid "The third-party account has been successfully disconnected."
 msgstr ""
 
-#: aleksis/core/views.py:1433
+#: aleksis/core/views.py:1435
 msgid "Person was invited successfully and an email with further instructions has been send to them."
 msgstr ""
 
-#: aleksis/core/views.py:1444
+#: aleksis/core/views.py:1446
 msgid "Person was already invited."
 msgstr ""
 
diff --git a/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po
index a92744d7bb504c8b8488c5b7a091e905ff06f151..7b3dcf5cecf2eb898338532c3ca412d75eda3df5 100644
--- a/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AlekSIS (School Information System) 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-15 20:00+0100\n"
+"POT-Creation-Date: 2023-02-27 13:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1153,15 +1153,15 @@ msgstr ""
 msgid "Country for phone number parsing"
 msgstr ""
 
-#: aleksis/core/settings.py:544
+#: aleksis/core/settings.py:549
 msgid "English"
 msgstr ""
 
-#: aleksis/core/settings.py:545
+#: aleksis/core/settings.py:550
 msgid "German"
 msgstr ""
 
-#: aleksis/core/settings.py:546
+#: aleksis/core/settings.py:551
 msgid "Ukrainian"
 msgstr ""
 
@@ -1233,19 +1233,6 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: aleksis/core/templates/503.html:10
-msgid ""
-"The maintenance mode is currently enabled. Please try again\n"
-"          later."
-msgstr ""
-
-#: aleksis/core/templates/503.html:13
-msgid ""
-"\n"
-"            This page is currently unavailable. If this error persists, contact your site administrators:\n"
-"          "
-msgstr ""
-
 #: aleksis/core/templates/account/account_inactive.html:5
 #: aleksis/core/templates/account/account_inactive.html:6
 msgid "Account inactive"
@@ -1330,7 +1317,7 @@ msgstr ""
 #: aleksis/core/templates/account/password_reset_done.html:5
 #: aleksis/core/templates/account/verification_email_required.html:5
 #: aleksis/core/templates/account/verification_email_required.html:6
-#: aleksis/core/templates/two_factor/core/login.html:100
+#: aleksis/core/templates/two_factor/core/login.html:110
 msgid "Reset password"
 msgstr ""
 
@@ -1975,6 +1962,13 @@ msgid ""
 "    "
 msgstr ""
 
+#: aleksis/core/templates/core/partials/splash_screen.html:17
+msgid ""
+"\n"
+"      The maintenance mode is currently enabled. Please try again later.\n"
+"    "
+msgstr ""
+
 #: aleksis/core/templates/core/perms/assign.html:12
 #: aleksis/core/templates/core/perms/assign.html:13
 msgid "Assign permission"
@@ -2493,15 +2487,12 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/_base_focus.html:6
-#: aleksis/core/templates/two_factor/core/otp_required.html:22
-#: aleksis/core/templates/two_factor/core/setup.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:88
+#: aleksis/core/templates/two_factor/core/otp_required.html:19
 msgid "Enable Two-Factor Authentication"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:5
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:46
 msgid "Backup Tokens"
 msgstr ""
 
@@ -2536,35 +2527,35 @@ msgid "Generate Tokens"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/login.html:6
-#: aleksis/core/templates/two_factor/core/login.html:32
-#: aleksis/core/templates/two_factor/core/login.html:95
+#: aleksis/core/templates/two_factor/core/login.html:36
+#: aleksis/core/templates/two_factor/core/login.html:105
 msgid "Login"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:27
+#: aleksis/core/templates/two_factor/core/login.html:31
 #, python-format
 msgid "Login for %(name)s"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:30
+#: aleksis/core/templates/two_factor/core/login.html:34
 msgid "Login with username and password"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:38
+#: aleksis/core/templates/two_factor/core/login.html:42
 msgid ""
 "You have no permission to view this page. Please login with an other\n"
 "                    account."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:47
+#: aleksis/core/templates/two_factor/core/login.html:51
 msgid "Please login with your account to use the external application."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:54
+#: aleksis/core/templates/two_factor/core/login.html:58
 msgid "Please login to see this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:65
+#: aleksis/core/templates/two_factor/core/login.html:69
 msgid ""
 "\n"
 "                        We are calling your phone right now, please enter the\n"
@@ -2572,23 +2563,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:70
+#: aleksis/core/templates/two_factor/core/login.html:74
+msgid ""
+"\n"
+"                        We sent you a text message, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:78
+msgid ""
+"\n"
+"                        We sent you an email, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:82
 msgid ""
 "\n"
-"                        We sent you a text message, please enter the tokens we\n"
-"                        sent.\n"
+"                        Please use your Webauthn-compatible device to authenticate.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:75
+#: aleksis/core/templates/two_factor/core/login.html:86
 msgid ""
 "\n"
-"                        Please enter the tokens generated by your token\n"
-"                        generator.\n"
+"                        Please enter the code generated by your code generator.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:81
+#: aleksis/core/templates/two_factor/core/login.html:91
 msgid ""
 "\n"
 "                      Use this form for entering backup tokens for logging in.\n"
@@ -2597,23 +2600,23 @@ msgid ""
 "                    "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:109
+#: aleksis/core/templates/two_factor/core/login.html:119
 msgid "Device currently not available?"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:111
-msgid "Or, alternatively, use one of your backup phones:"
+#: aleksis/core/templates/two_factor/core/login.html:121
+msgid "Alternatively, use one of your other authentication methods:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:122
+#: aleksis/core/templates/two_factor/core/login.html:133
 msgid "As a last resort, you can use a backup token:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:125
+#: aleksis/core/templates/two_factor/core/login.html:136
 msgid "Use Backup Token"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:136
+#: aleksis/core/templates/two_factor/core/login.html:147
 msgid "Use alternative login options"
 msgstr ""
 
@@ -2623,19 +2626,12 @@ msgstr ""
 
 #: aleksis/core/templates/two_factor/core/otp_required.html:10
 msgid ""
-"The page you requested, enforces users to verify using\n"
-"          two-factor authentication for security reasons. You need to enable these\n"
-"          security features in order to access this page."
+"The page you requested enforces users to verify using\n"
+"          two-factor authentication for security reasons. You need to enable this\n"
+"          security feature in order to access this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/otp_required.html:14
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-"          account. Enable two-factor authentication for enhanced account\n"
-"          security."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/core/otp_required.html:19
+#: aleksis/core/templates/two_factor/core/otp_required.html:16
 msgid "Go back"
 msgstr ""
 
@@ -2658,31 +2654,35 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/setup.html:9
+msgid "Add Two-Factor Authentication Method"
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:13
 msgid ""
 "\n"
 "        You are about to take your account security to the\n"
-"        next level. Follow the steps in this wizard to enable two-factor\n"
-"        authentication.\n"
+"        next level. Follow the steps in this wizard to add\n"
+"        a two-factor authentication method to your account.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:17
+#: aleksis/core/templates/two_factor/core/setup.html:21
 msgid ""
 "\n"
 "        Please select which authentication method you would like to use:\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:23
+#: aleksis/core/templates/two_factor/core/setup.html:27
 msgid ""
 "\n"
-"        To start using a token generator, please use your\n"
-"        favourite two factor authentication (TOTP) app to scan the QR code below.\n"
-"        Then, enter the token generated by the app.\n"
+"        To start using a code generator, please use your\n"
+"        favourite two-factor authentication (TOTP) app to scan the QR code below.\n"
+"        Then enter the token generated by the app.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:34
+#: aleksis/core/templates/two_factor/core/setup.html:38
 msgid ""
 "\n"
 "        Please enter the phone number you wish to receive the\n"
@@ -2690,7 +2690,7 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:41
+#: aleksis/core/templates/two_factor/core/setup.html:45
 msgid ""
 "\n"
 "        Please enter the phone number you wish to be called on.\n"
@@ -2698,21 +2698,28 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:50
+#: aleksis/core/templates/two_factor/core/setup.html:52
+msgid ""
+"\n"
+"        We sent you an email, please enter the token we sent.\n"
+"      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:60
 msgid ""
 "\n"
 "            We are calling your phone right now, please enter the digits you hear.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:56
+#: aleksis/core/templates/two_factor/core/setup.html:66
 msgid ""
 "\n"
-"            We sent you a text message, please enter the tokens we sent.\n"
+"            We sent you a text message, please enter the code we sent.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:63
+#: aleksis/core/templates/two_factor/core/setup.html:73
 msgid ""
 "\n"
 "          We've encountered an issue with the selected authentication method. Please\n"
@@ -2722,7 +2729,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:73
+#: aleksis/core/templates/two_factor/core/setup.html:83
 msgid ""
 "\n"
 "        To identify and verify your YubiKey, please insert a\n"
@@ -2736,41 +2743,38 @@ msgstr ""
 msgid "Two-Factor Authentication successfully enabled"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:14
+#: aleksis/core/templates/two_factor/core/setup_complete.html:13
 msgid ""
 "\n"
 "        Congratulations, you've successfully enabled two-factor authentication.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:24
-#: aleksis/core/templates/two_factor/core/setup_complete.html:44
+#: aleksis/core/templates/two_factor/core/setup_complete.html:22
+#: aleksis/core/templates/two_factor/core/setup_complete.html:40
 msgid "Back to Profile"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:28
-#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+#: aleksis/core/templates/two_factor/core/setup_complete.html:26
+#: aleksis/core/templates/two_factor/core/setup_complete.html:44
 msgid "Generate backup codes"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:34
+#: aleksis/core/templates/two_factor/core/setup_complete.html:31
 msgid ""
 "\n"
 "          However, it might happen that you don't have access to\n"
-"          your primary token device. To enable account recovery, generate backup codes\n"
-"          or add a phone number.\n"
+"          your primary device. To enable account recovery, generate backup codes\n"
+"          or add other authentication methods.\n"
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:52
-#: aleksis/core/templates/two_factor/profile/profile.html:41
-msgid "Add Phone Number"
+#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+msgid "Add Another Authentication Method"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/profile/disable.html:5
 #: aleksis/core/templates/two_factor/profile/disable.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:63
-#: aleksis/core/templates/two_factor/profile/profile.html:73
 msgid "Disable Two-Factor Authentication"
 msgstr ""
 
@@ -2782,78 +2786,6 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/profile/profile.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:10
-msgid "Account Security"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:15
-msgid "Tokens will be generated by your token generator."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:17
-#, python-format
-msgid "Primary method: %(primary)s"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:19
-msgid "Tokens will be generated by your YubiKey."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:23
-msgid "Backup Phone Numbers"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:24
-msgid ""
-"If your primary method is not available, we are able to\n"
-"        send backup tokens to the phone numbers listed below."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:33
-msgid "Unregister"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:48
-msgid ""
-"If you don't have any device with you, you can access\n"
-"        your account using backup tokens."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:50
-#, python-format
-msgid ""
-"\n"
-"        You have only one backup token remaining.\n"
-"      "
-msgid_plural ""
-"\n"
-"        You have %(counter)s backup tokens remaining.\n"
-"      "
-msgstr[0] ""
-msgstr[1] ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:59
-msgid "Show Codes"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:65
-msgid ""
-"\n"
-"        However we strongly discourage you to do so, you can\n"
-"        also disable two-factor authentication for your account.\n"
-"      "
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:78
-msgid ""
-"\n"
-"        Two-factor authentication is not enabled for your\n"
-"        account. Enable two-factor authentication for enhanced account\n"
-"        security.\n"
-"      "
-msgstr ""
-
 #: aleksis/core/util/notifications.py:64
 msgid "E-Mail"
 msgstr ""
@@ -2882,149 +2814,149 @@ msgstr ""
 msgid "Download PDF"
 msgstr ""
 
-#: aleksis/core/views.py:278
+#: aleksis/core/views.py:280
 msgid "The school term has been created."
 msgstr ""
 
-#: aleksis/core/views.py:290
+#: aleksis/core/views.py:292
 msgid "The school term has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:394
+#: aleksis/core/views.py:396
 msgid "The child groups were successfully saved."
 msgstr ""
 
-#: aleksis/core/views.py:413 aleksis/core/views.py:423
+#: aleksis/core/views.py:415 aleksis/core/views.py:425
 msgid "The person has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:473
+#: aleksis/core/views.py:475
 msgid "The group has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:556
+#: aleksis/core/views.py:558
 msgid "The announcement has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:572
+#: aleksis/core/views.py:574
 msgid "The announcement has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:641
+#: aleksis/core/views.py:643
 msgid "The requested preference registry does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:660
+#: aleksis/core/views.py:662
 msgid "The preferences have been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:684
+#: aleksis/core/views.py:686
 msgid "The person has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:698
+#: aleksis/core/views.py:700
 msgid "The group has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:730
+#: aleksis/core/views.py:732
 msgid "The additional field has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:765
+#: aleksis/core/views.py:767
 msgid "The additional field has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:790
+#: aleksis/core/views.py:792
 msgid "The group type has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:821
+#: aleksis/core/views.py:823
 msgid "The group type has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:856
+#: aleksis/core/views.py:858
 msgid "Progress: Run data checks"
 msgstr ""
 
-#: aleksis/core/views.py:857
+#: aleksis/core/views.py:859
 msgid "Run data checks …"
 msgstr ""
 
-#: aleksis/core/views.py:858
+#: aleksis/core/views.py:860
 msgid "The data checks were run successfully."
 msgstr ""
 
-#: aleksis/core/views.py:859
+#: aleksis/core/views.py:861
 msgid "There was a problem while running data checks."
 msgstr ""
 
-#: aleksis/core/views.py:876
+#: aleksis/core/views.py:878
 #, python-brace-format
 msgid "The solve option '{solve_option_obj.verbose_name}' "
 msgstr ""
 
-#: aleksis/core/views.py:886
+#: aleksis/core/views.py:888
 msgid "The requested solve option does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:919
+#: aleksis/core/views.py:921
 msgid "The dashboard widget has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:949
+#: aleksis/core/views.py:951
 msgid "The dashboard widget has been created."
 msgstr ""
 
-#: aleksis/core/views.py:959
+#: aleksis/core/views.py:961
 msgid "The dashboard widget has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1031
+#: aleksis/core/views.py:1033
 msgid "Your dashboard configuration has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1033
+#: aleksis/core/views.py:1035
 msgid "The configuration of the default dashboard has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1104
+#: aleksis/core/views.py:1106
 #, python-brace-format
 msgid "The invitation was successfully created. The invitation code is {code}"
 msgstr ""
 
-#: aleksis/core/views.py:1201
+#: aleksis/core/views.py:1203
 msgid "We have successfully assigned the permissions."
 msgstr ""
 
-#: aleksis/core/views.py:1211
+#: aleksis/core/views.py:1213
 msgid "The global user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1221
+#: aleksis/core/views.py:1223
 msgid "The global group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1231
+#: aleksis/core/views.py:1233
 msgid "The object user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1241
+#: aleksis/core/views.py:1243
 msgid "The object group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1350
+#: aleksis/core/views.py:1352
 msgid "The third-party account could not be disconnected because it is the only login method available."
 msgstr ""
 
-#: aleksis/core/views.py:1357
+#: aleksis/core/views.py:1359
 msgid "The third-party account has been successfully disconnected."
 msgstr ""
 
-#: aleksis/core/views.py:1433
+#: aleksis/core/views.py:1435
 msgid "Person was invited successfully and an email with further instructions has been send to them."
 msgstr ""
 
-#: aleksis/core/views.py:1444
+#: aleksis/core/views.py:1446
 msgid "Person was already invited."
 msgstr ""
 
diff --git a/aleksis/core/locale/ru/LC_MESSAGES/django.po b/aleksis/core/locale/ru/LC_MESSAGES/django.po
index 9abedfffc09e36b826d9b9388c3eea7450149f37..bbc0d0554c170e9e0c1954b5076d624da0e2e8e1 100644
--- a/aleksis/core/locale/ru/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/ru/LC_MESSAGES/django.po
@@ -7,18 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-22 20:49+0100\n"
+"POT-Creation-Date: 2023-02-27 13:23+0100\n"
 "PO-Revision-Date: 2023-02-08 22:40+0000\n"
 "Last-Translator: Serhii Horichenko <m@sgg.im>\n"
-"Language-Team: Russian <https://translate.edugit.org/projects/aleksis/"
-"aleksis-core/ru/>\n"
+"Language-Team: Russian <https://translate.edugit.org/projects/aleksis/aleksis-core/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 "X-Generator: Weblate 4.12.1\n"
 
 #: aleksis/core/apps.py:155
@@ -187,8 +184,7 @@ msgid "Write your announcement:"
 msgstr "Напишите свое объявление:"
 
 #: aleksis/core/forms.py:276
-msgid ""
-"You are not allowed to create announcements which are only valid in the past."
+msgid "You are not allowed to create announcements which are only valid in the past."
 msgstr "Объявления для прошлого Вам создавать не разрешено."
 
 #: aleksis/core/forms.py:280
@@ -236,8 +232,7 @@ msgid "Grant the permission for all objects"
 msgstr "Предоставить доступ ко всем объектам"
 
 #: aleksis/core/forms.py:494
-msgid ""
-"You must select at least one group or person which should get the permission."
+msgid "You must select at least one group or person which should get the permission."
 msgstr "Вам нужно выбрать хотя бы одну группу или физлицо, кто получит доступ."
 
 #: aleksis/core/forms.py:499
@@ -402,8 +397,7 @@ msgstr "муж"
 msgid "other"
 msgstr "другой"
 
-#: aleksis/core/models.py:189 aleksis/core/models.py:1345
-#: aleksis/core/models.py:1353
+#: aleksis/core/models.py:189 aleksis/core/models.py:1353
 msgid "Linked user"
 msgstr "Связанный пользователь"
 
@@ -412,7 +406,7 @@ msgid "Additional name(s)"
 msgstr "Дополнительные имена"
 
 #: aleksis/core/models.py:199 aleksis/core/models.py:511
-#: aleksis/core/models.py:1431 aleksis/core/models.py:1439
+#: aleksis/core/models.py:1439
 msgid "Short name"
 msgstr "Короткое имя"
 
@@ -453,11 +447,8 @@ msgid "Sex"
 msgstr "Пол"
 
 #: aleksis/core/models.py:221 aleksis/core/models.py:550
-msgid ""
-"This is an official photo, used for official documents and for internal use "
-"cases."
-msgstr ""
-"Это официальное фото, которое используется для документов и внутренних нужд."
+msgid "This is an official photo, used for official documents and for internal use cases."
+msgstr "Это официальное фото, которое используется для документов и внутренних нужд."
 
 #: aleksis/core/models.py:226 aleksis/core/models.py:554
 msgid "Display picture / Avatar"
@@ -477,7 +468,7 @@ msgstr "Основная группа"
 
 #: aleksis/core/models.py:244 aleksis/core/models.py:724
 #: aleksis/core/models.py:748 aleksis/core/models.py:843
-#: aleksis/core/models.py:1104 aleksis/core/models.py:1112
+#: aleksis/core/models.py:1112
 msgid "Description"
 msgstr "Описание"
 
@@ -513,8 +504,7 @@ msgstr "Может определять дочерние группы в гру
 msgid "Can view statistics about group."
 msgstr "Может видеть статистику группы."
 
-#: aleksis/core/models.py:509 aleksis/core/models.py:1432
-#: aleksis/core/models.py:1440
+#: aleksis/core/models.py:509 aleksis/core/models.py:1440
 msgid "Long name"
 msgstr "Длинное имя"
 
@@ -541,9 +531,8 @@ msgid "Additional fields"
 msgstr "Дополнительные поля"
 
 #: aleksis/core/models.py:723 aleksis/core/models.py:747
-#: aleksis/core/models.py:842 aleksis/core/models.py:1262
+#: aleksis/core/models.py:842 aleksis/core/models.py:1270
 #: aleksis/core/templates/core/announcement/list.html:18
-#: aleksis/core/models.py:1270
 msgid "Title"
 msgstr "Название"
 
@@ -572,9 +561,8 @@ msgid "Link"
 msgstr "Ссылка"
 
 #: aleksis/core/models.py:752 aleksis/core/models.py:1079
-#: aleksis/core/models.py:1392
-#: aleksis/core/templates/oauth2_provider/application/detail.html:26
 #: aleksis/core/models.py:1400
+#: aleksis/core/templates/oauth2_provider/application/detail.html:26
 msgid "Icon"
 msgstr "Иконка"
 
@@ -756,211 +744,205 @@ msgstr "Пункт пользовательского меню"
 msgid "Custom menu items"
 msgstr "Пункты пользовательского меню"
 
-#: aleksis/core/models.py:1103 aleksis/core/models.py:1111
+#: aleksis/core/models.py:1111
 msgid "Title of type"
 msgstr "Название типа"
 
-#: aleksis/core/models.py:1110 aleksis/core/templates/core/group/full.html:50
-#: aleksis/core/models.py:1118
+#: aleksis/core/models.py:1118 aleksis/core/templates/core/group/full.html:50
 msgid "Group type"
 msgstr "Тип группы"
 
-#: aleksis/core/models.py:1111
+#: aleksis/core/models.py:1119
 #: aleksis/core/templates/core/group_type/list.html:8
 #: aleksis/core/templates/core/group_type/list.html:9
-#: aleksis/core/models.py:1119
 msgid "Group types"
 msgstr "Типы групп"
 
-#: aleksis/core/models.py:1124 aleksis/core/models.py:1132
+#: aleksis/core/models.py:1132
 msgid "Can view system status"
 msgstr "Может просматривать состояние системы"
 
-#: aleksis/core/models.py:1125 aleksis/core/models.py:1133
+#: aleksis/core/models.py:1133
 msgid "Can manage data"
 msgstr "Может управлять данными"
 
-#: aleksis/core/models.py:1126 aleksis/core/models.py:1134
+#: aleksis/core/models.py:1134
 msgid "Can impersonate"
 msgstr "Может маскироваться"
 
-#: aleksis/core/models.py:1127 aleksis/core/models.py:1135
+#: aleksis/core/models.py:1135
 msgid "Can use search"
 msgstr "Может использовать поиск"
 
-#: aleksis/core/models.py:1128 aleksis/core/models.py:1136
+#: aleksis/core/models.py:1136
 msgid "Can change site preferences"
 msgstr "Может менять свойства сайта"
 
-#: aleksis/core/models.py:1129 aleksis/core/models.py:1137
+#: aleksis/core/models.py:1137
 msgid "Can change person preferences"
 msgstr "Может менять персональные свойства"
 
-#: aleksis/core/models.py:1130 aleksis/core/models.py:1138
+#: aleksis/core/models.py:1138
 msgid "Can change group preferences"
 msgstr "Может менять свойства группы"
 
-#: aleksis/core/models.py:1131 aleksis/core/models.py:1139
+#: aleksis/core/models.py:1139
 msgid "Can test PDF generation"
 msgstr "Может генерировать тестовые PDF"
 
-#: aleksis/core/models.py:1132 aleksis/core/models.py:1140
+#: aleksis/core/models.py:1140
 msgid "Can invite persons"
 msgstr "Может приглашать других"
 
-#: aleksis/core/models.py:1168 aleksis/core/models.py:1176
+#: aleksis/core/models.py:1176
 msgid "Related data check task"
 msgstr "Задание проверки связанных данных"
 
-#: aleksis/core/models.py:1176 aleksis/core/models.py:1184
+#: aleksis/core/models.py:1184
 msgid "Issue solved"
 msgstr "Проблема решена"
 
-#: aleksis/core/models.py:1177 aleksis/core/models.py:1185
+#: aleksis/core/models.py:1185
 msgid "Notification sent"
 msgstr "Уведомление отправлено"
 
-#: aleksis/core/models.py:1190 aleksis/core/models.py:1198
+#: aleksis/core/models.py:1198
 msgid "Data check result"
 msgstr "Результат проверки данных"
 
-#: aleksis/core/models.py:1191 aleksis/core/models.py:1199
+#: aleksis/core/models.py:1199
 msgid "Data check results"
 msgstr "Результаты проверки данных"
 
-#: aleksis/core/models.py:1193 aleksis/core/models.py:1201
+#: aleksis/core/models.py:1201
 msgid "Can run data checks"
 msgstr "Может запускать проверки данных"
 
-#: aleksis/core/models.py:1194 aleksis/core/models.py:1202
+#: aleksis/core/models.py:1202
 msgid "Can solve data check problems"
 msgstr "Может решать проблемы проверки данных"
 
-#: aleksis/core/models.py:1201 aleksis/core/models.py:1209
+#: aleksis/core/models.py:1209
 msgid "E-Mail address"
 msgstr "Адрес эл.почты"
 
-#: aleksis/core/models.py:1233 aleksis/core/models.py:1241
+#: aleksis/core/models.py:1241
 msgid "Owner"
 msgstr "Владелец"
 
-#: aleksis/core/models.py:1237 aleksis/core/models.py:1245
+#: aleksis/core/models.py:1245
 msgid "File expires at"
 msgstr "Файл действителен до"
 
-#: aleksis/core/models.py:1240 aleksis/core/models.py:1248
+#: aleksis/core/models.py:1248
 msgid "Generated HTML file"
 msgstr "Сгенерированный файл HTML"
 
-#: aleksis/core/models.py:1243 aleksis/core/models.py:1251
+#: aleksis/core/models.py:1251
 msgid "Generated PDF file"
 msgstr "Сгенерированный файл PDF"
 
-#: aleksis/core/models.py:1250 aleksis/core/models.py:1258
+#: aleksis/core/models.py:1258
 msgid "PDF file"
 msgstr "Файл PDF"
 
-#: aleksis/core/models.py:1251 aleksis/core/models.py:1259
+#: aleksis/core/models.py:1259
 msgid "PDF files"
 msgstr "Файлы PDF"
 
-#: aleksis/core/models.py:1256 aleksis/core/models.py:1264
+#: aleksis/core/models.py:1264
 msgid "Task result"
 msgstr "Результат задания"
 
-#: aleksis/core/models.py:1259 aleksis/core/models.py:1267
+#: aleksis/core/models.py:1267
 msgid "Task user"
 msgstr "Пользователь задания"
 
-#: aleksis/core/models.py:1263
+#: aleksis/core/models.py:1271
 msgid "Back URL"
 msgstr "URL для возврата"
 
-#: aleksis/core/models.py:1264
+#: aleksis/core/models.py:1272
 msgid "Progress title"
 msgstr "Название процесса"
 
-#: aleksis/core/models.py:1265
+#: aleksis/core/models.py:1273
 msgid "Error message"
 msgstr "Сообщение об ошибке"
 
-#: aleksis/core/models.py:1266
+#: aleksis/core/models.py:1274
 msgid "Success message"
 msgstr "Сообщение об успехе"
 
-#: aleksis/core/models.py:1267
+#: aleksis/core/models.py:1275
 msgid "Redirect on success URL"
 msgstr "URL для перенаправления в случае успеха"
 
-#: aleksis/core/models.py:1269
+#: aleksis/core/models.py:1277
 msgid "Additional button title"
 msgstr "Название дополнительной кнопки"
 
-#: aleksis/core/models.py:1271
+#: aleksis/core/models.py:1279
 msgid "Additional button URL"
 msgstr "URL дополнительной кнопки"
 
-#: aleksis/core/models.py:1273
+#: aleksis/core/models.py:1281
 msgid "Additional button icon"
 msgstr "Иконка дополнительной кнопки"
 
-#: aleksis/core/models.py:1275
+#: aleksis/core/models.py:1283
 msgid "Result fetched"
 msgstr "Полученный результат"
 
-#: aleksis/core/models.py:1300
+#: aleksis/core/models.py:1308
 msgid "Background task completed successfully"
 msgstr "Фоновое задание успешно завершено"
 
-#: aleksis/core/models.py:1301
+#: aleksis/core/models.py:1309
 msgid "The background task '{}' has been completed successfully."
 msgstr "Фоновое задание \"{}\" успешно завершено."
 
-#: aleksis/core/models.py:1307
+#: aleksis/core/models.py:1315
 msgid "Background task failed"
 msgstr "Ошибка фонового задания"
 
-#: aleksis/core/models.py:1308
+#: aleksis/core/models.py:1316
 msgid "The background task '{}' has failed."
 msgstr "Ошибка фонового задания \"{}\"."
 
-#: aleksis/core/models.py:1317
+#: aleksis/core/models.py:1325
 msgid "Background task"
 msgstr "Фоновое задание"
 
-#: aleksis/core/models.py:1331 aleksis/core/models.py:1339
+#: aleksis/core/models.py:1339
 msgid "Task user assignment"
 msgstr "Назначение пользователя задания"
 
-#: aleksis/core/models.py:1332 aleksis/core/models.py:1340
+#: aleksis/core/models.py:1340
 msgid "Task user assignments"
 msgstr "Назначения пользователей задания"
 
-#: aleksis/core/models.py:1348 aleksis/core/models.py:1356
+#: aleksis/core/models.py:1356
 msgid "Additional attributes"
 msgstr "Дополнительные атрибуты"
 
-#: aleksis/core/models.py:1386 aleksis/core/models.py:1394
+#: aleksis/core/models.py:1394
 msgid "Allowed scopes that clients can request"
 msgstr "Разрешённые пределы действия, которые могут запрашивать клиенты"
 
-#: aleksis/core/models.py:1396 aleksis/core/models.py:1404
-msgid ""
-"This image will be shown as icon in the authorization flow. It should be "
-"squared."
-msgstr ""
-"Это изображение будет использоваться в качестве значка во время авторизации. "
-"Должно быть квадратным."
+#: aleksis/core/models.py:1404
+msgid "This image will be shown as icon in the authorization flow. It should be squared."
+msgstr "Это изображение будет использоваться в качестве значка во время авторизации. Должно быть квадратным."
 
-#: aleksis/core/models.py:1441
+#: aleksis/core/models.py:1449
 msgid "Can view room timetable"
 msgstr "Может просмативать расписание комнаты"
 
-#: aleksis/core/models.py:1443
+#: aleksis/core/models.py:1451
 msgid "Room"
 msgstr "Комната"
 
-#: aleksis/core/models.py:1444
+#: aleksis/core/models.py:1452
 msgid "Rooms"
 msgstr "Комнаты"
 
@@ -1073,11 +1055,8 @@ msgid "Automatically create new persons for new users"
 msgstr "Новые физлица для новых пользователей создавать автоматически"
 
 #: aleksis/core/preferences.py:256
-msgid ""
-"Automatically link existing persons to new users by their e-mail address"
-msgstr ""
-"Связывать существующие физлица с новыми пользователями автоматически по эл."
-"адресам"
+msgid "Automatically link existing persons to new users by their e-mail address"
+msgstr "Связывать существующие физлица с новыми пользователями автоматически по эл.адресам"
 
 #: aleksis/core/preferences.py:267
 msgid "Display name of the school"
@@ -1085,9 +1064,7 @@ msgstr "Название школы / уч.заведения для отобр
 
 #: aleksis/core/preferences.py:278
 msgid "Official name of the school, e.g. as given by supervisory authority"
-msgstr ""
-"Официальное название школы / уч.заведения, напр., как в регистрационных "
-"документах"
+msgstr "Официальное название школы / уч.заведения, напр., как в регистрационных документах"
 
 #: aleksis/core/preferences.py:286
 msgid "Allow users to change their passwords"
@@ -1146,11 +1123,8 @@ msgid "Fields on person model which are editable by themselves."
 msgstr "Поля с описанием физлица, которые можно редактировать самостоятельно."
 
 #: aleksis/core/preferences.py:424
-msgid ""
-"Editable fields on person model which should trigger a notification on change"
-msgstr ""
-"Изменяемые поля описания физлица, при изменении которых должен срабатывать "
-"триггер для уведомления"
+msgid "Editable fields on person model which should trigger a notification on change"
+msgstr "Изменяемые поля описания физлица, при изменении которых должен срабатывать триггер для уведомления"
 
 #: aleksis/core/preferences.py:438
 msgid "Contact for notification if a person changes their data"
@@ -1180,15 +1154,15 @@ msgstr "Автоматически обновлять информпанель 
 msgid "Country for phone number parsing"
 msgstr "Страна для парсинга номера телефона"
 
-#: aleksis/core/settings.py:539 aleksis/core/settings.py:544
+#: aleksis/core/settings.py:549
 msgid "English"
 msgstr "Английский"
 
-#: aleksis/core/settings.py:540 aleksis/core/settings.py:545
+#: aleksis/core/settings.py:550
 msgid "German"
 msgstr "Немецкий"
 
-#: aleksis/core/settings.py:541 aleksis/core/settings.py:546
+#: aleksis/core/settings.py:551
 msgid "Ukrainian"
 msgstr "Украинский"
 
@@ -1231,14 +1205,12 @@ msgstr ""
 #: aleksis/core/templates/403.html:19 aleksis/core/templates/404.html:16
 msgid ""
 "\n"
-"            If you think this is an error in AlekSIS, please contact your "
-"site\n"
+"            If you think this is an error in AlekSIS, please contact your site\n"
 "            administrators:\n"
 "          "
 msgstr ""
 "\n"
-"            Если Вы думаете, что это ошибка AlekSIS, обратитесь, "
-"пожалуйста,\n"
+"            Если Вы думаете, что это ошибка AlekSIS, обратитесь, пожалуйста,\n"
 "            к администраторам сайта:\n"
 "          "
 
@@ -1265,14 +1237,12 @@ msgstr ""
 #: aleksis/core/templates/500.html:13
 msgid ""
 "\n"
-"            Your site administrators will automatically be notified about "
-"this\n"
+"            Your site administrators will automatically be notified about this\n"
 "            error. You can also contact them directly:\n"
 "          "
 msgstr ""
 "\n"
-"            Администраторы сайта будут уведомлены об этой ошибке "
-"автоматически.\n"
+"            Администраторы сайта будут уведомлены об этой ошибке автоматически.\n"
 "            Вы также можете обратиться к ним непосредственно:\n"
 "          "
 
@@ -1280,26 +1250,6 @@ msgstr ""
 msgid "Retry"
 msgstr "Попытаться ещё"
 
-#: aleksis/core/templates/503.html:10
-msgid ""
-"The maintenance mode is currently enabled. Please try again\n"
-"          later."
-msgstr ""
-"Сайт находится на обслуживании. Попробуйте зайти\n"
-"          позже."
-
-#: aleksis/core/templates/503.html:13
-msgid ""
-"\n"
-"            This page is currently unavailable. If this error persists, "
-"contact your site administrators:\n"
-"          "
-msgstr ""
-"\n"
-"            Эта страница сейчас недоступна. Если ошибка проявится ещё раз, "
-"обратитесь к администраторам сайта:\n"
-"          "
-
 #: aleksis/core/templates/account/account_inactive.html:5
 #: aleksis/core/templates/account/account_inactive.html:6
 msgid "Account inactive"
@@ -1338,21 +1288,13 @@ msgstr "Подтвердить"
 
 #: aleksis/core/templates/account/email_confirm.html:12
 #, python-format
-msgid ""
-"Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail "
-"address for user %(user_display)s."
-msgstr ""
-"Подтвердите, пожалуйста, что <a href=\"mailto:%(email)s\">%(email)s</a> — эл."
-"адрес пользователя %(user_display)s."
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr "Подтвердите, пожалуйста, что <a href=\"mailto:%(email)s\">%(email)s</a> — эл.адрес пользователя %(user_display)s."
 
 #: aleksis/core/templates/account/email_confirm.html:25
 #, python-format
-msgid ""
-"This e-mail confirmation link expired or is invalid. Please <a href="
-"\"%(email_url)s\">issue a new e-mail confirmation request</a>."
-msgstr ""
-"Эта ссылка для подтверждения эл.почты просрочена или недействительна. "
-"Сделайте, пожалуйста, <a href=\"%(email_url)s\">новый запрос</a>."
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr "Эта ссылка для подтверждения эл.почты просрочена или недействительна. Сделайте, пожалуйста, <a href=\"%(email_url)s\">новый запрос</a>."
 
 #: aleksis/core/templates/account/password_change.html:5
 #: aleksis/core/templates/account/password_change.html:6
@@ -1386,8 +1328,7 @@ msgstr "Изменение пароля отключено."
 msgid ""
 "\n"
 "            Users are not allowed to edit their own passwords. If you think\n"
-"            this is an error please contact one of your site "
-"administrators.\n"
+"            this is an error please contact one of your site administrators.\n"
 "          "
 msgstr ""
 "\n"
@@ -1401,17 +1342,13 @@ msgstr ""
 #: aleksis/core/templates/account/password_reset_done.html:5
 #: aleksis/core/templates/account/verification_email_required.html:5
 #: aleksis/core/templates/account/verification_email_required.html:6
-#: aleksis/core/templates/two_factor/core/login.html:100
+#: aleksis/core/templates/two_factor/core/login.html:110
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
 #: aleksis/core/templates/account/password_reset.html:17
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll send you "
-"an e-mail allowing you to reset it."
-msgstr ""
-"Забыли пароль? Укажите ниже свою эл.почту и мы отправим Вам письмо для "
-"сброса пароля."
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr "Забыли пароль? Укажите ниже свою эл.почту и мы отправим Вам письмо для сброса пароля."
 
 #: aleksis/core/templates/account/password_reset.html:30
 msgid ""
@@ -1434,10 +1371,8 @@ msgid ""
 "          "
 msgstr ""
 "\n"
-"            Мы отправили Вам эл.письмо. Если Вы не получите его на "
-"протяжении\n"
-"            нескольких минут, обратитесь, пожалуйста, к администраторам "
-"сайта.\n"
+"            Мы отправили Вам эл.письмо. Если Вы не получите его на протяжении\n"
+"            нескольких минут, обратитесь, пожалуйста, к администраторам сайта.\n"
 "          "
 
 #: aleksis/core/templates/account/password_reset_from_key.html:15
@@ -1448,16 +1383,13 @@ msgstr "Неправильный токен"
 #, python-format
 msgid ""
 "\n"
-"              The password reset link was invalid, possibly because it has "
-"already been used. Please request a <a href=\"%(passwd_reset_url)s\"\n"
+"              The password reset link was invalid, possibly because it has already been used. Please request a <a href=\"%(passwd_reset_url)s\"\n"
 "              class=\"blue-text text-lighten-2\">new password reset</a>.\n"
 "            "
 msgstr ""
 "\n"
-"              Ссылка на сброс пароля недействительна или, возможно, уже "
-"использована. Сделайте, пожалуйста, <a href=\"%(passwd_reset_url)s\"\n"
-"              class=\"blue-text text-lighten-2\">новый запрос на сброс "
-"пароля</a>.\n"
+"              Ссылка на сброс пароля недействительна или, возможно, уже использована. Сделайте, пожалуйста, <a href=\"%(passwd_reset_url)s\"\n"
+"              class=\"blue-text text-lighten-2\">новый запрос на сброс пароля</a>.\n"
 "            "
 
 #: aleksis/core/templates/account/password_reset_from_key.html:25
@@ -1506,11 +1438,8 @@ msgstr "Регистрация"
 
 #: aleksis/core/templates/account/signup.html:12
 #, python-format
-msgid ""
-"Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
-msgstr ""
-"У Вас уже есть учётная запись? В таком случае можете <a href=\"%(login_url)s"
-"\">войти</a>."
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr "У Вас уже есть учётная запись? В таком случае можете <a href=\"%(login_url)s\">войти</a>."
 
 #: aleksis/core/templates/account/signup.html:22
 #: aleksis/core/templates/socialaccount/signup.html:23
@@ -1554,17 +1483,13 @@ msgstr "Подтвердите свой адрес эл.почты!"
 #: aleksis/core/templates/account/verification_sent.html:16
 msgid ""
 "\n"
-"            This part of the site requires us to verify that you are who you "
-"claim to be.\n"
-"            For this purpose, we require that you verify ownership of your e-"
-"mail address.\n"
+"            This part of the site requires us to verify that you are who you claim to be.\n"
+"            For this purpose, we require that you verify ownership of your e-mail address.\n"
 "          "
 msgstr ""
 "\n"
-"            Для этой части сайта необходимо пройти проверку, что Вы - именно "
-"Ð’Ñ‹.\n"
-"            Для этого нам нужно проверить как минимум, что адрес эл.почты "
-"принадлежит именно Вам\n"
+"            Для этой части сайта необходимо пройти проверку, что Вы - именно Вы.\n"
+"            Для этого нам нужно проверить как минимум, что адрес эл.почты принадлежит именно Вам\n"
 "          "
 
 #: aleksis/core/templates/account/verification_sent.html:22
@@ -1578,8 +1503,7 @@ msgstr ""
 "\n"
 "            Мы отправили Вам для проверки эл.письмо.\n"
 "            Пожалуйста, перейдите по указанной ссылке. Если Вы не получите\n"
-"            письмо в ближайшие несколько минут, обратитесь, пожалуйста, к "
-"нам.\n"
+"            письмо в ближайшие несколько минут, обратитесь, пожалуйста, к нам.\n"
 "          "
 
 #: aleksis/core/templates/core/additional_field/edit.html:6
@@ -1754,39 +1678,29 @@ msgstr "Редактировать информпанель"
 #: aleksis/core/templates/core/edit_dashboard.html:24
 msgid ""
 "\n"
-"          On this page you can arrange your personal dashboard. You can drag "
-"any items from \"Available widgets\" to \"Your\n"
-"          Dashboard\" or change the order by moving the widgets. After you "
-"have finished, please don't forget to click on\n"
+"          On this page you can arrange your personal dashboard. You can drag any items from \"Available widgets\" to \"Your\n"
+"          Dashboard\" or change the order by moving the widgets. After you have finished, please don't forget to click on\n"
 "          \"Save\".\n"
 "        "
 msgstr ""
 "\n"
-"          На этой странице Вы можете упорядочить свою информпанель. "
-"Перетаскивайте любые элементы из \"Доступных виджетов\"\n"
-"          в \"Свою информпанель\" или меняйте порядок, перетягивая виджеты. "
-"После завершения не забудьте нажать\n"
+"          На этой странице Вы можете упорядочить свою информпанель. Перетаскивайте любые элементы из \"Доступных виджетов\"\n"
+"          в \"Свою информпанель\" или меняйте порядок, перетягивая виджеты. После завершения не забудьте нажать\n"
 "          \"Сохранить\".\n"
 "        "
 
 #: aleksis/core/templates/core/edit_dashboard.html:30
 msgid ""
 "\n"
-"          On this page you can arrange the default dashboard which is shown "
-"when a user doesn't arrange his own\n"
-"          dashboard. You can drag any items from \"Available widgets\" to "
-"\"Default Dashboard\" or change the order\n"
-"          by moving the widgets. After you have finished, please don't "
-"forget to click on \"Save\".\n"
+"          On this page you can arrange the default dashboard which is shown when a user doesn't arrange his own\n"
+"          dashboard. You can drag any items from \"Available widgets\" to \"Default Dashboard\" or change the order\n"
+"          by moving the widgets. After you have finished, please don't forget to click on \"Save\".\n"
 "        "
 msgstr ""
 "\n"
-"          На этой странице Вы можете упорядочить типовую/стандартную "
-"информпанель, которая отображается, если пользователь\n"
-"          не настроил свою. Перетягивайте любые элементы из \"Доступных "
-"виджетов\" в \"Типовую информпанель\" или меняйте \n"
-"          порядок, перетягивая виджеты. После заврешения не забудьте нажать "
-"\"Сохранить\".\n"
+"          На этой странице Вы можете упорядочить типовую/стандартную информпанель, которая отображается, если пользователь\n"
+"          не настроил свою. Перетягивайте любые элементы из \"Доступных виджетов\" в \"Типовую информпанель\" или меняйте \n"
+"          порядок, перетягивая виджеты. После заврешения не забудьте нажать \"Сохранить\".\n"
 "        "
 
 #: aleksis/core/templates/core/edit_dashboard.html:48
@@ -1809,16 +1723,13 @@ msgstr "Определить дочерние группы к группе"
 #: aleksis/core/templates/core/group/child_groups.html:18
 msgid ""
 "\n"
-"          You can use this to assign child groups to groups. Please use the "
-"filters below to select groups you want to\n"
+"          You can use this to assign child groups to groups. Please use the filters below to select groups you want to\n"
 "          change and click \"Next\".\n"
 "        "
 msgstr ""
 "\n"
-"          Вы можете воспользоваться этим для привязки дочерних групп к "
-"основным. Для выбора групп,\n"
-"          которые хотите изменить, используйте фильтры, расположенные ниже и "
-"нажмите \"Далее\".\n"
+"          Вы можете воспользоваться этим для привязки дочерних групп к основным. Для выбора групп,\n"
+"          которые хотите изменить, используйте фильтры, расположенные ниже и нажмите \"Далее\".\n"
 "        "
 
 #: aleksis/core/templates/core/group/child_groups.html:31
@@ -1844,8 +1755,7 @@ msgid ""
 "          "
 msgstr ""
 "\n"
-"            Выберите, пожалуйста, несколько групп в порядке, по какому "
-"привязывать.\n"
+"            Выберите, пожалуйста, несколько групп в порядке, по какому привязывать.\n"
 "          "
 
 #: aleksis/core/templates/core/group/child_groups.html:72
@@ -1859,18 +1769,14 @@ msgstr "Пожалуйста, будьте аккуратны!"
 #: aleksis/core/templates/core/group/child_groups.html:79
 msgid ""
 "\n"
-"            If you click \"Back\" or \"Next\" the current group assignments "
-"are not saved.\n"
-"            If you click \"Save\", you will overwrite all existing child "
-"group relations for this group with what you\n"
+"            If you click \"Back\" or \"Next\" the current group assignments are not saved.\n"
+"            If you click \"Save\", you will overwrite all existing child group relations for this group with what you\n"
 "            selected on this page.\n"
 "          "
 msgstr ""
 "\n"
-"            Если нажмёте \"Назад\" или \"Далее\" привязки этой группы не "
-"сохранятся.\n"
-"            Если нажмёте \"Сохранить\", все существующие связи дочерней "
-"группы с этой группой будут заменены на\n"
+"            Если нажмёте \"Назад\" или \"Далее\" привязки этой группы не сохранятся.\n"
+"            Если нажмёте \"Сохранить\", все существующие связи дочерней группы с этой группой будут заменены на\n"
 "            выбранные на этой странице.\n"
 "          "
 
@@ -1968,14 +1874,12 @@ msgstr "Домой"
 #: aleksis/core/templates/core/index.html:34
 msgid ""
 "\n"
-"        You didn't customise your dashboard so that you see the system "
-"default. Please click on \"Edit dashboard\" to\n"
+"        You didn't customise your dashboard so that you see the system default. Please click on \"Edit dashboard\" to\n"
 "        customise your personal dashboard.\n"
 "      "
 msgstr ""
 "\n"
-"        Вы ещё не настроили свою информпанель, так что пока наблюдаете "
-"типовую по-умолчанию. Для настройки \n"
+"        Вы ещё не настроили свою информпанель, так что пока наблюдаете типовую по-умолчанию. Для настройки \n"
 "         своей информпанели клацните \"Редактировать информпанель\".\n"
 "      "
 
@@ -2019,13 +1923,11 @@ msgstr "Включен режим обслуживания"
 #: aleksis/core/templates/core/pages/system_status.html:24
 msgid ""
 "\n"
-"                Only admin and visitors from internal IPs can access the "
-"site.\n"
+"                Only admin and visitors from internal IPs can access the site.\n"
 "              "
 msgstr ""
 "\n"
-"                Доступ к сайту имеют только администратор и пользователи с "
-"внутренними IP-адресами.\n"
+"                Доступ к сайту имеют только администратор и пользователи с внутренними IP-адресами.\n"
 "              "
 
 #: aleksis/core/templates/core/pages/system_status.html:36
@@ -2043,13 +1945,11 @@ msgstr "Режим отладки включен"
 #: aleksis/core/templates/core/pages/system_status.html:49
 msgid ""
 "\n"
-"                The web server throws back debug information on errors. Do "
-"not use in production!\n"
+"                The web server throws back debug information on errors. Do not use in production!\n"
 "              "
 msgstr ""
 "\n"
-"                Веб-сервер во время ошибок пишет отладочную информацию. Не "
-"используйте в продакшене!\n"
+"                Веб-сервер во время ошибок пишет отладочную информацию. Не используйте в продакшене!\n"
 "              "
 
 #: aleksis/core/templates/core/pages/system_status.html:56
@@ -2059,13 +1959,11 @@ msgstr "Режим отладки отключен"
 #: aleksis/core/templates/core/pages/system_status.html:58
 msgid ""
 "\n"
-"                Debug mode is disabled. Default error pages are displayed on "
-"errors.\n"
+"                Debug mode is disabled. Default error pages are displayed on errors.\n"
 "              "
 msgstr ""
 "\n"
-"                Режим отладки отключен. В случае ошибок будут отображаться "
-"стандартные страницы об ошибках.\n"
+"                Режим отладки отключен. В случае ошибок будут отображаться стандартные страницы об ошибках.\n"
 "              "
 
 #: aleksis/core/templates/core/pages/system_status.html:71
@@ -2115,13 +2013,11 @@ msgstr "Пробное генерирование PDF"
 #: aleksis/core/templates/core/pages/test_pdf.html:14
 msgid ""
 "\n"
-"        This simple view can be used to ensure the correct function of the "
-"built-in PDF generation system.\n"
+"        This simple view can be used to ensure the correct function of the built-in PDF generation system.\n"
 "      "
 msgstr ""
 "\n"
-"        Эта простая страница может помочь проверить корректность настроек "
-"встроенной системы генерирования PDF.\n"
+"        Эта простая страница может помочь проверить корректность настроек встроенной системы генерирования PDF.\n"
 "      "
 
 #: aleksis/core/templates/core/partials/announcements.html:8
@@ -2179,15 +2075,25 @@ msgstr "Неизвестно"
 #: aleksis/core/templates/core/partials/splash_screen.html:11
 msgid ""
 "\n"
-"      This webbrowser doesn't support JavaScript, or its execution is "
-"blocked. Please use another browser to continue.\n"
+"      This webbrowser doesn't support JavaScript, or its execution is blocked. Please use another browser to continue.\n"
 "    "
 msgstr ""
 "\n"
-"      Этот веб-браузер не поддерживает JavaScript или его обработка "
-"заблокирована. Для продолжения воспользуйтесь, пожалуйста, другим "
-"браузером.\n"
+"      Этот веб-браузер не поддерживает JavaScript или его обработка заблокирована. Для продолжения воспользуйтесь, пожалуйста, другим браузером.\n"
+"    "
+
+#: aleksis/core/templates/core/partials/splash_screen.html:17
+#, fuzzy
+#| msgid ""
+#| "The maintenance mode is currently enabled. Please try again\n"
+#| "          later."
+msgid ""
+"\n"
+"      The maintenance mode is currently enabled. Please try again later.\n"
 "    "
+msgstr ""
+"Сайт находится на обслуживании. Попробуйте зайти\n"
+"          позже."
 
 #: aleksis/core/templates/core/perms/assign.html:12
 #: aleksis/core/templates/core/perms/assign.html:13
@@ -2299,11 +2205,8 @@ msgid "The invite feature is disabled."
 msgstr "Фукция приглашения выключена."
 
 #: aleksis/core/templates/invitations/disabled.html:15
-msgid ""
-"To enable it, switch on the corresponding checkbox in the authentication "
-"section of the "
-msgstr ""
-"Для активации включите соответствующий чекбокс в разделе авторизации на "
+msgid "To enable it, switch on the corresponding checkbox in the authentication section of the "
+msgstr "Для активации включите соответствующий чекбокс в разделе авторизации на "
 
 #: aleksis/core/templates/invitations/disabled.html:16
 msgid "site preferences page"
@@ -2475,18 +2378,14 @@ msgstr "В автономном режиме страница не доступ
 #: aleksis/core/templates/offline.html:14
 msgid ""
 "\n"
-"      This page is not available offline. Since you probably don't have an "
-"internet connection, check to see if your WiFi\n"
-"      or mobile data is turned on and try again. If you think you are "
-"connected, please contact the system\n"
+"      This page is not available offline. Since you probably don't have an internet connection, check to see if your WiFi\n"
+"      or mobile data is turned on and try again. If you think you are connected, please contact the system\n"
 "      administrators:\n"
 "    "
 msgstr ""
 "\n"
-"      Эта страница в автономном режимен не доступна. Возможно, у Вас "
-"проблема с интернетом. Убедитесь, что Ваш WiFi\n"
-"      или мобильный интернет включены и попробуйте ещё раз. Если считаете, "
-"что с подключением всё хорошо, обратитесь,\n"
+"      Эта страница в автономном режимен не доступна. Возможно, у Вас проблема с интернетом. Убедитесь, что Ваш WiFi\n"
+"      или мобильный интернет включены и попробуйте ещё раз. Если считаете, что с подключением всё хорошо, обратитесь,\n"
 "      пожалуйста, к системным администраторам:\n"
 "    "
 
@@ -2522,14 +2421,12 @@ msgstr "Ошибка входа учётной записи третьей ст
 #: aleksis/core/templates/socialaccount/authentication_error.html:15
 msgid ""
 "\n"
-"            An error occurred while attempting to login via your third-party "
-"account.\n"
+"            An error occurred while attempting to login via your third-party account.\n"
 "            Please contact one of your site administrators.\n"
 "          "
 msgstr ""
 "\n"
-"            Во время попытки входа с Вашей сторонней учётной записью "
-"возникла ошибка входа.\n"
+"            Во время попытки входа с Вашей сторонней учётной записью возникла ошибка входа.\n"
 "            Обратитесь, пожалуйста, к администратору сайта.\n"
 "          "
 
@@ -2544,9 +2441,7 @@ msgstr "Удалить"
 
 #: aleksis/core/templates/socialaccount/connections.html:34
 msgid "You currently have no third-party accounts connected to this account."
-msgstr ""
-"Сейчас у Вас нет учётных записей третих сторон, соединённых с этой учётной "
-"записью."
+msgstr "Сейчас у Вас нет учётных записей третих сторон, соединённых с этой учётной записью."
 
 #: aleksis/core/templates/socialaccount/connections.html:37
 msgid "Add a Third-party Account"
@@ -2576,15 +2471,11 @@ msgstr "Вход отменён"
 #, python-format
 msgid ""
 "\n"
-"            You decided to cancel logging in to our site using one of your "
-"existing accounts. If this was a mistake, please proceed to <a href="
-"\"%(login_url)s\">sign in</a>.\n"
+"            You decided to cancel logging in to our site using one of your existing accounts. If this was a mistake, please proceed to <a href=\"%(login_url)s\">sign in</a>.\n"
 "          "
 msgstr ""
 "\n"
-"            Похоже, Вы отменили вход на наш сайт с одной из Ваших учётных "
-"записей. Если это произошло случайно, Вы можете <a href=\"%(login_url)s"
-"\">продолжить вход здесь</a>.\n"
+"            Похоже, Вы отменили вход на наш сайт с одной из Ваших учётных записей. Если это произошло случайно, Вы можете <a href=\"%(login_url)s\">продолжить вход здесь</a>.\n"
 "          "
 
 #: aleksis/core/templates/socialaccount/signup.html:12
@@ -2594,8 +2485,7 @@ msgid ""
 "        %(site_name)s. As a final step, please complete the following form:"
 msgstr ""
 "Вы на пути к использованию своей учётной записи %(provider_name)s\n"
-"        для входа в %(site_name)s. Заполните, пожалуйста, для завершения эту "
-"форму:"
+"        для входа в %(site_name)s. Заполните, пожалуйста, для завершения эту форму:"
 
 #: aleksis/core/templates/socialaccount/snippets/provider_list.html:12
 #, python-format
@@ -2682,25 +2572,21 @@ msgstr "Система обнаружила новые проблемы с Ва
 #: aleksis/core/templates/templated_email/data_checks.email:6
 msgid ""
 "the system detected some new problems with your data.\n"
-"Please take some time to inspect them and solve the issues or mark them as "
-"ignored."
+"Please take some time to inspect them and solve the issues or mark them as ignored."
 msgstr ""
 "система обнаружила новые проблемы с Вашими данными.\n"
-"Уделите, пожалуйста, немного времени для их проверки и решения проблем, или "
-"же отметьте их для игнорирования."
+"Уделите, пожалуйста, немного времени для их проверки и решения проблем, или же отметьте их для игнорирования."
 
 #: aleksis/core/templates/templated_email/data_checks.email:15
 msgid ""
 "\n"
 "   the system detected some new problems with your data.\n"
-"   Please take some time to inspect them and solve the issues or mark them "
-"as ignored.\n"
+"   Please take some time to inspect them and solve the issues or mark them as ignored.\n"
 "  "
 msgstr ""
 "\n"
 "   система обнаружила новые проблемы с Вашими данными.\n"
-"   Уделите, пожалуйста, немного времени для их проверки и решения проблем, "
-"или же отметьте их для игнорирования.\n"
+"   Уделите, пожалуйста, немного времени для их проверки и решения проблем, или же отметьте их для игнорирования.\n"
 "  "
 
 #: aleksis/core/templates/templated_email/data_checks.email:23
@@ -2769,15 +2655,12 @@ msgstr ""
 "  "
 
 #: aleksis/core/templates/two_factor/_base_focus.html:6
-#: aleksis/core/templates/two_factor/core/otp_required.html:22
-#: aleksis/core/templates/two_factor/core/setup.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:88
+#: aleksis/core/templates/two_factor/core/otp_required.html:19
 msgid "Enable Two-Factor Authentication"
 msgstr "Включить двух-факторную аутентификацию"
 
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:5
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:46
 msgid "Backup Tokens"
 msgstr "Резервные токены"
 
@@ -2786,22 +2669,16 @@ msgid ""
 "\n"
 "        Backup tokens can be used when your primary and backup\n"
 "        phone numbers aren't available. The backup tokens below can be used\n"
-"        for login verification. If you've used up all your backup tokens, "
-"you\n"
-"        can generate a new set of backup tokens. Only the backup tokens "
-"shown\n"
+"        for login verification. If you've used up all your backup tokens, you\n"
+"        can generate a new set of backup tokens. Only the backup tokens shown\n"
 "        below will be valid.\n"
 "      "
 msgstr ""
 "\n"
-"        Резервные токены могут быть использованы, когда Ваши основной и "
-"резервный\n"
-"        телефонные номера недоступны. Резервные токены, указанные ниже, "
-"могут быть\n"
-"        использованы для верификации входа. Когда Вы используете все "
-"резервные токены,\n"
-"        Вы сможете сгенерировать новый набор резервных токенов. "
-"Действительными будут только\n"
+"        Резервные токены могут быть использованы, когда Ваши основной и резервный\n"
+"        телефонные номера недоступны. Резервные токены, указанные ниже, могут быть\n"
+"        использованы для верификации входа. Когда Вы используете все резервные токены,\n"
+"        Вы сможете сгенерировать новый набор резервных токенов. Действительными будут только\n"
 "        токены, указанные ниже.\n"
 "      "
 
@@ -2828,21 +2705,21 @@ msgid "Generate Tokens"
 msgstr "Создать Токены"
 
 #: aleksis/core/templates/two_factor/core/login.html:6
-#: aleksis/core/templates/two_factor/core/login.html:32
-#: aleksis/core/templates/two_factor/core/login.html:95
+#: aleksis/core/templates/two_factor/core/login.html:36
+#: aleksis/core/templates/two_factor/core/login.html:105
 msgid "Login"
 msgstr "Войти"
 
-#: aleksis/core/templates/two_factor/core/login.html:27
+#: aleksis/core/templates/two_factor/core/login.html:31
 #, python-format
 msgid "Login for %(name)s"
 msgstr "Войти для %(name)s"
 
-#: aleksis/core/templates/two_factor/core/login.html:30
+#: aleksis/core/templates/two_factor/core/login.html:34
 msgid "Login with username and password"
 msgstr "Войдите с использованием логина и пароля"
 
-#: aleksis/core/templates/two_factor/core/login.html:38
+#: aleksis/core/templates/two_factor/core/login.html:42
 msgid ""
 "You have no permission to view this page. Please login with an other\n"
 "                    account."
@@ -2850,49 +2727,85 @@ msgstr ""
 "У Вас нет разрешения на просмотр этой страницы. Войдите, пожалуйста,\n"
 "                    с другой учётной записью."
 
-#: aleksis/core/templates/two_factor/core/login.html:47
+#: aleksis/core/templates/two_factor/core/login.html:51
 msgid "Please login with your account to use the external application."
-msgstr ""
-"Для использования внешнего приложения войдите, пожалуйста, в свою учётную "
-"запись."
+msgstr "Для использования внешнего приложения войдите, пожалуйста, в свою учётную запись."
 
-#: aleksis/core/templates/two_factor/core/login.html:54
+#: aleksis/core/templates/two_factor/core/login.html:58
 msgid "Please login to see this page."
 msgstr "Для просмотра этой страницы, пожалуйста, войдите."
 
-#: aleksis/core/templates/two_factor/core/login.html:65
+#: aleksis/core/templates/two_factor/core/login.html:69
 msgid ""
 "\n"
-"                        We are calling your phone right now, please enter "
-"the\n"
+"                        We are calling your phone right now, please enter the\n"
 "                        digits you hear.\n"
 "                      "
 msgstr ""
 "\n"
-"                        Мы сейчас позвоним на Ваш номер. Напишите, "
-"пожалуйста, цифры,\n"
+"                        Мы сейчас позвоним на Ваш номер. Напишите, пожалуйста, цифры,\n"
 "                        которые Вы услышите.\n"
 "                      "
 
-#: aleksis/core/templates/two_factor/core/login.html:70
+#: aleksis/core/templates/two_factor/core/login.html:74
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                        We sent you a text message, please enter the tokens we\n"
+#| "                        sent.\n"
+#| "                      "
+msgid ""
+"\n"
+"                        We sent you a text message, please enter the code we sent.\n"
+"                      "
+msgstr ""
+"\n"
+"                        Мы отправили Вам текстовое сообщение. Напишите, пожалуйста, полученный\n"
+"                        токен.\n"
+"                      "
+
+#: aleksis/core/templates/two_factor/core/login.html:78
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                        We sent you a text message, please enter the tokens we\n"
+#| "                        sent.\n"
+#| "                      "
 msgid ""
 "\n"
-"                        We sent you a text message, please enter the tokens "
-"we\n"
-"                        sent.\n"
+"                        We sent you an email, please enter the code we sent.\n"
 "                      "
 msgstr ""
 "\n"
-"                        Мы отправили Вам текстовое сообщение. Напишите, "
-"пожалуйста, полученный\n"
+"                        Мы отправили Вам текстовое сообщение. Напишите, пожалуйста, полученный\n"
 "                        токен.\n"
 "                      "
 
-#: aleksis/core/templates/two_factor/core/login.html:75
+#: aleksis/core/templates/two_factor/core/login.html:82
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                    This app is licenced under %(licence)s.\n"
+#| "                  "
 msgid ""
 "\n"
-"                        Please enter the tokens generated by your token\n"
-"                        generator.\n"
+"                        Please use your Webauthn-compatible device to authenticate.\n"
+"                      "
+msgstr ""
+"\n"
+"                    Это приложение под лицензией %(licence)s.\n"
+"                  "
+
+#: aleksis/core/templates/two_factor/core/login.html:86
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                        Please enter the tokens generated by your token\n"
+#| "                        generator.\n"
+#| "                      "
+msgid ""
+"\n"
+"                        Please enter the code generated by your code generator.\n"
 "                      "
 msgstr ""
 "\n"
@@ -2900,44 +2813,39 @@ msgstr ""
 "                        генератора токенов.\n"
 "                      "
 
-#: aleksis/core/templates/two_factor/core/login.html:81
+#: aleksis/core/templates/two_factor/core/login.html:91
 msgid ""
 "\n"
-"                      Use this form for entering backup tokens for logging "
-"in.\n"
-"                      These tokens have been generated for you to print and "
-"keep safe. Please\n"
-"                      enter one of these backup tokens to login to your "
-"account.\n"
+"                      Use this form for entering backup tokens for logging in.\n"
+"                      These tokens have been generated for you to print and keep safe. Please\n"
+"                      enter one of these backup tokens to login to your account.\n"
 "                    "
 msgstr ""
 "\n"
-"                      Для входа воспользуйтесь формой для ввода резервных "
-"токенов.\n"
-"                      Эти токены были сгенерированы, чтобы Вы распечатали их "
-"и сохранили в надёжном месте.\n"
-"                      Для входа укажите, пожалуйста, один из резервных "
-"токенов.\n"
+"                      Для входа воспользуйтесь формой для ввода резервных токенов.\n"
+"                      Эти токены были сгенерированы, чтобы Вы распечатали их и сохранили в надёжном месте.\n"
+"                      Для входа укажите, пожалуйста, один из резервных токенов.\n"
 "                    "
 
-#: aleksis/core/templates/two_factor/core/login.html:109
+#: aleksis/core/templates/two_factor/core/login.html:119
 msgid "Device currently not available?"
 msgstr "Сейчас устройство недоступно?"
 
-#: aleksis/core/templates/two_factor/core/login.html:111
-msgid "Or, alternatively, use one of your backup phones:"
+#: aleksis/core/templates/two_factor/core/login.html:121
+#, fuzzy
+#| msgid "Or, alternatively, use one of your backup phones:"
+msgid "Alternatively, use one of your other authentication methods:"
 msgstr "Или можете воспользоваться одним из резервных телефонов:"
 
-#: aleksis/core/templates/two_factor/core/login.html:122
+#: aleksis/core/templates/two_factor/core/login.html:133
 msgid "As a last resort, you can use a backup token:"
-msgstr ""
-"В качестве последней возможности можете воспользоваться резервным токеном:"
+msgstr "В качестве последней возможности можете воспользоваться резервным токеном:"
 
-#: aleksis/core/templates/two_factor/core/login.html:125
+#: aleksis/core/templates/two_factor/core/login.html:136
 msgid "Use Backup Token"
 msgstr "Воспользоваться резервным токеном"
 
-#: aleksis/core/templates/two_factor/core/login.html:136
+#: aleksis/core/templates/two_factor/core/login.html:147
 msgid "Use alternative login options"
 msgstr "Воспользоваться альтернативными возможностями для входа"
 
@@ -2946,30 +2854,21 @@ msgid "Permission Denied"
 msgstr "Доступ отсутствует"
 
 #: aleksis/core/templates/two_factor/core/otp_required.html:10
+#, fuzzy
+#| msgid ""
+#| "The page you requested, enforces users to verify using\n"
+#| "          two-factor authentication for security reasons. You need to enable these\n"
+#| "          security features in order to access this page."
 msgid ""
-"The page you requested, enforces users to verify using\n"
-"          two-factor authentication for security reasons. You need to enable "
-"these\n"
-"          security features in order to access this page."
-msgstr ""
-"Для просмотра запрошенной страницы, с оглядкой на безопасность, необходима "
-"дополнительная\n"
-"          проверка пользователя с использованием двухфакторной "
-"аутентификации.\n"
-"          Для доступа к данной странице Вы должны включить эти функции "
-"безопасности."
-
-#: aleksis/core/templates/two_factor/core/otp_required.html:14
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-"          account. Enable two-factor authentication for enhanced account\n"
-"          security."
+"The page you requested enforces users to verify using\n"
+"          two-factor authentication for security reasons. You need to enable this\n"
+"          security feature in order to access this page."
 msgstr ""
-"Двухфакторная аутентификация в Вашей учётной записи отключена\n"
-"          Для увеличения безопасности учётки включите двухфакторную\n"
-"          аутентификацию."
+"Для просмотра запрошенной страницы, с оглядкой на безопасность, необходима дополнительная\n"
+"          проверка пользователя с использованием двухфакторной аутентификации.\n"
+"          Для доступа к данной странице Вы должны включить эти функции безопасности."
 
-#: aleksis/core/templates/two_factor/core/otp_required.html:19
+#: aleksis/core/templates/two_factor/core/otp_required.html:16
 msgid "Go back"
 msgstr "Назад"
 
@@ -2997,49 +2896,64 @@ msgstr ""
 "      пожалуйста, полученный токен."
 
 #: aleksis/core/templates/two_factor/core/setup.html:9
+#, fuzzy
+#| msgid "Enable Two-Factor Authentication"
+msgid "Add Two-Factor Authentication Method"
+msgstr "Включить двух-факторную аутентификацию"
+
+#: aleksis/core/templates/two_factor/core/setup.html:13
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "        You are about to take your account security to the\n"
+#| "        next level. Follow the steps in this wizard to enable two-factor\n"
+#| "        authentication.\n"
+#| "      "
 msgid ""
 "\n"
 "        You are about to take your account security to the\n"
-"        next level. Follow the steps in this wizard to enable two-factor\n"
-"        authentication.\n"
+"        next level. Follow the steps in this wizard to add\n"
+"        a two-factor authentication method to your account.\n"
 "      "
 msgstr ""
 "\n"
-"        Вы устанавливаете для своей учётной записи новый уровень "
-"безопасности.\n"
+"        Вы устанавливаете для своей учётной записи новый уровень безопасности.\n"
 "        Для включения двухфакторной аутентификации пройдите несколько шагов\n"
 "        мастера настройки.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:17
+#: aleksis/core/templates/two_factor/core/setup.html:21
 msgid ""
 "\n"
 "        Please select which authentication method you would like to use:\n"
 "      "
 msgstr ""
 "\n"
-"        Выберите, пожалуйста, метод аутентификации, который Вы хотите "
-"использовать:\n"
+"        Выберите, пожалуйста, метод аутентификации, который Вы хотите использовать:\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:23
+#: aleksis/core/templates/two_factor/core/setup.html:27
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "        To start using a token generator, please use your\n"
+#| "        favourite two factor authentication (TOTP) app to scan the QR code below.\n"
+#| "        Then, enter the token generated by the app.\n"
+#| "      "
 msgid ""
 "\n"
-"        To start using a token generator, please use your\n"
-"        favourite two factor authentication (TOTP) app to scan the QR code "
-"below.\n"
-"        Then, enter the token generated by the app.\n"
+"        To start using a code generator, please use your\n"
+"        favourite two-factor authentication (TOTP) app to scan the QR code below.\n"
+"        Then enter the token generated by the app.\n"
 "      "
 msgstr ""
 "\n"
-"        Для того, чтобы начать использование генератора токенов, "
-"воспользуйтесь, пожалуйста, своим\n"
-"        любимым приложением для двухфакторной аутентификации (TOTP) и "
-"отсканируйте QR-код, который видите ниже.\n"
+"        Для того, чтобы начать использование генератора токенов, воспользуйтесь, пожалуйста, своим\n"
+"        любимым приложением для двухфакторной аутентификации (TOTP) и отсканируйте QR-код, который видите ниже.\n"
 "        После этого напишите полученный генератором токен.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:34
+#: aleksis/core/templates/two_factor/core/setup.html:38
 msgid ""
 "\n"
 "        Please enter the phone number you wish to receive the\n"
@@ -3051,7 +2965,7 @@ msgstr ""
 "        получать текстовые сообщения. На следующем этапе он будет проверен.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:41
+#: aleksis/core/templates/two_factor/core/setup.html:45
 msgid ""
 "\n"
 "        Please enter the phone number you wish to be called on.\n"
@@ -3063,52 +2977,63 @@ msgstr ""
 "        получать звонки. На следующем этапе он будет проверен.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:50
+#: aleksis/core/templates/two_factor/core/setup.html:52
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "            We sent you a text message, please enter the tokens we sent.\n"
+#| "          "
 msgid ""
 "\n"
-"            We are calling your phone right now, please enter the digits you "
-"hear.\n"
+"        We sent you an email, please enter the token we sent.\n"
+"      "
+msgstr ""
+"\n"
+"            Мы отправили Вам текстовое сообщение. Напишите, пожалуйста, полученные токены.\n"
+"          "
+
+#: aleksis/core/templates/two_factor/core/setup.html:60
+msgid ""
+"\n"
+"            We are calling your phone right now, please enter the digits you hear.\n"
 "          "
 msgstr ""
 "\n"
-"            Мы сейчас звоним на Ваш номер, – напишите, пожалуйста, цифры, "
-"которые услышите.\n"
+"            Мы сейчас звоним на Ваш номер, – напишите, пожалуйста, цифры, которые услышите.\n"
 "          "
 
-#: aleksis/core/templates/two_factor/core/setup.html:56
+#: aleksis/core/templates/two_factor/core/setup.html:66
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "            We sent you a text message, please enter the tokens we sent.\n"
+#| "          "
 msgid ""
 "\n"
-"            We sent you a text message, please enter the tokens we sent.\n"
+"            We sent you a text message, please enter the code we sent.\n"
 "          "
 msgstr ""
 "\n"
-"            Мы отправили Вам текстовое сообщение. Напишите, пожалуйста, "
-"полученные токены.\n"
+"            Мы отправили Вам текстовое сообщение. Напишите, пожалуйста, полученные токены.\n"
 "          "
 
-#: aleksis/core/templates/two_factor/core/setup.html:63
+#: aleksis/core/templates/two_factor/core/setup.html:73
 msgid ""
 "\n"
-"          We've encountered an issue with the selected authentication "
-"method. Please\n"
-"          go back and verify that you entered your information correctly, "
-"try\n"
-"          again, or use a different authentication method instead. If the "
-"issue\n"
+"          We've encountered an issue with the selected authentication method. Please\n"
+"          go back and verify that you entered your information correctly, try\n"
+"          again, or use a different authentication method instead. If the issue\n"
 "          persists, contact the site administrator.\n"
 "        "
 msgstr ""
 "\n"
-"          Мы заметили, что существует проблема с использованием выбранного "
-"метода авторизации. Вернитесь,\n"
-"          пожалуйста, назад, и убедитесь, что необходимые данные указаны "
-"правильно,\n"
-"          после чего попробуйте зайти ешё раз, или же воспользуйтесь другим "
-"вариантом входа. Если же\n"
+"          Мы заметили, что существует проблема с использованием выбранного метода авторизации. Вернитесь,\n"
+"          пожалуйста, назад, и убедитесь, что необходимые данные указаны правильно,\n"
+"          после чего попробуйте зайти ешё раз, или же воспользуйтесь другим вариантом входа. Если же\n"
 "          проблема остаётся, обратитесь к администратору сайта.\n"
 "        "
 
-#: aleksis/core/templates/two_factor/core/setup.html:73
+#: aleksis/core/templates/two_factor/core/setup.html:83
 msgid ""
 "\n"
 "        To identify and verify your YubiKey, please insert a\n"
@@ -3127,168 +3052,64 @@ msgstr ""
 msgid "Two-Factor Authentication successfully enabled"
 msgstr "Двухфакторная аутентификация успешно включена"
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:14
+#: aleksis/core/templates/two_factor/core/setup_complete.html:13
 msgid ""
 "\n"
-"        Congratulations, you've successfully enabled two-factor "
-"authentication.\n"
+"        Congratulations, you've successfully enabled two-factor authentication.\n"
 "      "
 msgstr ""
 "\n"
 "        Поздравляем с успешной настройкой двухфакторной аутентификации.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:24
-#: aleksis/core/templates/two_factor/core/setup_complete.html:44
+#: aleksis/core/templates/two_factor/core/setup_complete.html:22
+#: aleksis/core/templates/two_factor/core/setup_complete.html:40
 msgid "Back to Profile"
 msgstr "Назад к Профилю"
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:28
-#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+#: aleksis/core/templates/two_factor/core/setup_complete.html:26
+#: aleksis/core/templates/two_factor/core/setup_complete.html:44
 msgid "Generate backup codes"
 msgstr "Создать резервные коды"
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:34
+#: aleksis/core/templates/two_factor/core/setup_complete.html:31
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "          However, it might happen that you don't have access to\n"
+#| "          your primary token device. To enable account recovery, generate backup codes\n"
+#| "          or add a phone number.\n"
+#| "        "
 msgid ""
 "\n"
 "          However, it might happen that you don't have access to\n"
-"          your primary token device. To enable account recovery, generate "
-"backup codes\n"
-"          or add a phone number.\n"
+"          your primary device. To enable account recovery, generate backup codes\n"
+"          or add other authentication methods.\n"
 "        "
 msgstr ""
 "\n"
-"          Между прочим, может так случиться, что у Вас не будет доступа к "
-"своему основному\n"
-"          устройству с токенами. Для включения восстановления учётки "
-"создайте резервные коды\n"
+"          Между прочим, может так случиться, что у Вас не будет доступа к своему основному\n"
+"          устройству с токенами. Для включения восстановления учётки создайте резервные коды\n"
 "          или добавьте номер телефона.\n"
 "        "
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:52
-#: aleksis/core/templates/two_factor/profile/profile.html:41
-msgid "Add Phone Number"
-msgstr "Добавить номер телефона"
+#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+msgid "Add Another Authentication Method"
+msgstr ""
 
 #: aleksis/core/templates/two_factor/profile/disable.html:5
 #: aleksis/core/templates/two_factor/profile/disable.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:63
-#: aleksis/core/templates/two_factor/profile/profile.html:73
 msgid "Disable Two-Factor Authentication"
 msgstr "Отключить двухфакторную аутентификацию"
 
 #: aleksis/core/templates/two_factor/profile/disable.html:12
-msgid ""
-"You are about to disable two-factor authentication. This weakens your "
-"account security, are you sure?"
-msgstr ""
-"Вы отключаете двухфакторную аутентификацию. Это снизит защиту Вашей учётной "
-"записи. Вы уверены?"
+msgid "You are about to disable two-factor authentication. This weakens your account security, are you sure?"
+msgstr "Вы отключаете двухфакторную аутентификацию. Это снизит защиту Вашей учётной записи. Вы уверены?"
 
 #: aleksis/core/templates/two_factor/profile/disable.html:26
 msgid "Disable"
 msgstr "Отключить"
 
-#: aleksis/core/templates/two_factor/profile/profile.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:10
-msgid "Account Security"
-msgstr "Безопасность учётной записи"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:15
-msgid "Tokens will be generated by your token generator."
-msgstr "Токены будут созданы Вашим генератором токенов."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:17
-#, python-format
-msgid "Primary method: %(primary)s"
-msgstr "Основной метод: %(primary)s"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:19
-msgid "Tokens will be generated by your YubiKey."
-msgstr "Токены будут созданы Вашим YubiKey."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:23
-msgid "Backup Phone Numbers"
-msgstr "Резервные номера телефонов"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:24
-msgid ""
-"If your primary method is not available, we are able to\n"
-"        send backup tokens to the phone numbers listed below."
-msgstr ""
-"Если Ваш основной метод будет не доступен, мы сможем\n"
-"         отправить резервные токены на указанные ниже телефонные номера."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:33
-msgid "Unregister"
-msgstr "Отменить регистрацию"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:48
-msgid ""
-"If you don't have any device with you, you can access\n"
-"        your account using backup tokens."
-msgstr ""
-"Если у Вас с собой нет ни одного устройства, Вы можете\n"
-"        получить доступ с использованием резервных токенов."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:50
-#, python-format
-msgid ""
-"\n"
-"        You have only one backup token remaining.\n"
-"      "
-msgid_plural ""
-"\n"
-"        You have %(counter)s backup tokens remaining.\n"
-"      "
-msgstr[0] ""
-"\n"
-"        У Вас остался только один резервный токен.\n"
-"      "
-msgstr[1] ""
-"\n"
-"        У Вас осталось %(counter)s резервных токена.\n"
-"      "
-msgstr[2] ""
-"\n"
-"        У Вас осталось %(counter)s резервных токенов.\n"
-"      "
-msgstr[3] ""
-"\n"
-"        У Вас остался %(counter)s резервный токен.\n"
-"      "
-
-#: aleksis/core/templates/two_factor/profile/profile.html:59
-msgid "Show Codes"
-msgstr "Показать коды"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:65
-msgid ""
-"\n"
-"        However we strongly discourage you to do so, you can\n"
-"        also disable two-factor authentication for your account.\n"
-"      "
-msgstr ""
-"\n"
-"        Не смотря на то, что мы Вам рекомендуем этого не делать, Вы можете \n"
-"        также отключить двухфакторную аутентификацию для своей учётной "
-"записи.\n"
-"      "
-
-#: aleksis/core/templates/two_factor/profile/profile.html:78
-msgid ""
-"\n"
-"        Two-factor authentication is not enabled for your\n"
-"        account. Enable two-factor authentication for enhanced account\n"
-"        security.\n"
-"      "
-msgstr ""
-"\n"
-"        Двухфакторная аутентификация для Вашей учётной записи\n"
-"        не активирована. Для повышения безопасности учётной записи включите\n"
-"        двухфакторную аутентификацию.\n"
-"      "
-
 #: aleksis/core/util/notifications.py:64
 msgid "E-Mail"
 msgstr "Эл.почта"
@@ -3317,160 +3138,259 @@ msgstr "Во время создания файла PDF возникла про
 msgid "Download PDF"
 msgstr "Скачать PDF"
 
-#: aleksis/core/views.py:278
+#: aleksis/core/views.py:280
 msgid "The school term has been created."
 msgstr "Учебный год создан."
 
-#: aleksis/core/views.py:290
+#: aleksis/core/views.py:292
 msgid "The school term has been saved."
 msgstr "Учебный год сохранён."
 
-#: aleksis/core/views.py:394
+#: aleksis/core/views.py:396
 msgid "The child groups were successfully saved."
 msgstr "Дочерние группы сохранены."
 
-#: aleksis/core/views.py:413 aleksis/core/views.py:423
+#: aleksis/core/views.py:415 aleksis/core/views.py:425
 msgid "The person has been saved."
 msgstr "Физлицо сохранено."
 
-#: aleksis/core/views.py:473
+#: aleksis/core/views.py:475
 msgid "The group has been saved."
 msgstr "Группа сохранена."
 
-#: aleksis/core/views.py:556
+#: aleksis/core/views.py:558
 msgid "The announcement has been saved."
 msgstr "Объявление сохранено."
 
-#: aleksis/core/views.py:572
+#: aleksis/core/views.py:574
 msgid "The announcement has been deleted."
 msgstr "Объявление удалено."
 
-#: aleksis/core/views.py:641
+#: aleksis/core/views.py:643
 msgid "The requested preference registry does not exist"
 msgstr "Журнал с запрошенными свойствами не существует"
 
-#: aleksis/core/views.py:660
+#: aleksis/core/views.py:662
 msgid "The preferences have been saved successfully."
 msgstr "Свойства сохранены."
 
-#: aleksis/core/views.py:684
+#: aleksis/core/views.py:686
 msgid "The person has been deleted."
 msgstr "Физлицо удалено."
 
-#: aleksis/core/views.py:698
+#: aleksis/core/views.py:700
 msgid "The group has been deleted."
 msgstr "Группа удалена."
 
-#: aleksis/core/views.py:730
+#: aleksis/core/views.py:732
 msgid "The additional field has been saved."
 msgstr "Дополнительное поле сохранено."
 
-#: aleksis/core/views.py:765
+#: aleksis/core/views.py:767
 msgid "The additional field has been deleted."
 msgstr "Дополнительное поле удалено."
 
-#: aleksis/core/views.py:790
+#: aleksis/core/views.py:792
 msgid "The group type has been saved."
 msgstr "Тип группы сохранён."
 
-#: aleksis/core/views.py:821
+#: aleksis/core/views.py:823
 msgid "The group type has been deleted."
 msgstr "Тип группы удалён."
 
-#: aleksis/core/views.py:856
+#: aleksis/core/views.py:858
 msgid "Progress: Run data checks"
 msgstr "В процессе: Запуск проверки данных"
 
-#: aleksis/core/views.py:857
+#: aleksis/core/views.py:859
 msgid "Run data checks …"
 msgstr "Запускается проверка данных …"
 
-#: aleksis/core/views.py:858
+#: aleksis/core/views.py:860
 msgid "The data checks were run successfully."
 msgstr "Проверка данных успешно запущена."
 
-#: aleksis/core/views.py:859
+#: aleksis/core/views.py:861
 msgid "There was a problem while running data checks."
 msgstr "Во время запуска проверки данных возникла проблема."
 
-#: aleksis/core/views.py:876
+#: aleksis/core/views.py:878
 #, python-brace-format
 msgid "The solve option '{solve_option_obj.verbose_name}' "
 msgstr "Вариант решения \"{solve_option_obj.verbose_name}\" "
 
-#: aleksis/core/views.py:886
+#: aleksis/core/views.py:888
 msgid "The requested solve option does not exist"
 msgstr "Запрошенный вариант решения не существует"
 
-#: aleksis/core/views.py:919
+#: aleksis/core/views.py:921
 msgid "The dashboard widget has been saved."
 msgstr "Виджет информпанели сохранён."
 
-#: aleksis/core/views.py:949
+#: aleksis/core/views.py:951
 msgid "The dashboard widget has been created."
 msgstr "Виджет информпанели создан."
 
-#: aleksis/core/views.py:959
+#: aleksis/core/views.py:961
 msgid "The dashboard widget has been deleted."
 msgstr "Виджет информпанели удалён."
 
-#: aleksis/core/views.py:1030 aleksis/core/views.py:1031
+#: aleksis/core/views.py:1033
 msgid "Your dashboard configuration has been saved successfully."
 msgstr "Ваша конфигурация информпанели сохранена."
 
-#: aleksis/core/views.py:1032 aleksis/core/views.py:1033
+#: aleksis/core/views.py:1035
 msgid "The configuration of the default dashboard has been saved successfully."
 msgstr "Конфигурация типовой/стандартной информпанели."
 
-#: aleksis/core/views.py:1103 aleksis/core/views.py:1104
+#: aleksis/core/views.py:1106
 #, python-brace-format
 msgid "The invitation was successfully created. The invitation code is {code}"
 msgstr "Приглашение успешно создано. Код приглашения: {code}"
 
-#: aleksis/core/views.py:1200 aleksis/core/views.py:1201
+#: aleksis/core/views.py:1203
 msgid "We have successfully assigned the permissions."
 msgstr "Мы успешно назначили доступы."
 
-#: aleksis/core/views.py:1210 aleksis/core/views.py:1211
+#: aleksis/core/views.py:1213
 msgid "The global user permission has been deleted."
 msgstr "Глобальный пользовательский доступ удалён."
 
-#: aleksis/core/views.py:1220 aleksis/core/views.py:1221
+#: aleksis/core/views.py:1223
 msgid "The global group permission has been deleted."
 msgstr "Глобальный групповой доступ удалён."
 
-#: aleksis/core/views.py:1230 aleksis/core/views.py:1231
+#: aleksis/core/views.py:1233
 msgid "The object user permission has been deleted."
 msgstr "Объектный пользовательский доступ удалён."
 
-#: aleksis/core/views.py:1240 aleksis/core/views.py:1241
+#: aleksis/core/views.py:1243
 msgid "The object group permission has been deleted."
 msgstr "Объектный групповой доступ удалён."
 
-#: aleksis/core/views.py:1349 aleksis/core/views.py:1350
-msgid ""
-"The third-party account could not be disconnected because it is the only "
-"login method available."
-msgstr ""
-"Учётную запись третьей стороны нельзя отключить, т.к. это единственный "
-"способ входа."
+#: aleksis/core/views.py:1352
+msgid "The third-party account could not be disconnected because it is the only login method available."
+msgstr "Учётную запись третьей стороны нельзя отключить, т.к. это единственный способ входа."
 
-#: aleksis/core/views.py:1356 aleksis/core/views.py:1357
+#: aleksis/core/views.py:1359
 msgid "The third-party account has been successfully disconnected."
 msgstr "Учётная запись третьей стороны успешно отключена."
 
-#: aleksis/core/views.py:1432 aleksis/core/views.py:1433
-msgid ""
-"Person was invited successfully and an email with further instructions has "
-"been send to them."
-msgstr ""
-"Владелец указанного эл.адреса успешно приглашён. Инструкции о дальнейших "
-"действиях отправлены на эл.почту."
+#: aleksis/core/views.py:1435
+msgid "Person was invited successfully and an email with further instructions has been send to them."
+msgstr "Владелец указанного эл.адреса успешно приглашён. Инструкции о дальнейших действиях отправлены на эл.почту."
 
-#: aleksis/core/views.py:1443 aleksis/core/views.py:1444
+#: aleksis/core/views.py:1446
 msgid "Person was already invited."
 msgstr "Кто-то уже пригласил его/её."
 
+#~ msgid ""
+#~ "\n"
+#~ "            This page is currently unavailable. If this error persists, contact your site administrators:\n"
+#~ "          "
+#~ msgstr ""
+#~ "\n"
+#~ "            Эта страница сейчас недоступна. Если ошибка проявится ещё раз, обратитесь к администраторам сайта:\n"
+#~ "          "
+
+#~ msgid ""
+#~ "Two-factor authentication is not enabled for your\n"
+#~ "          account. Enable two-factor authentication for enhanced account\n"
+#~ "          security."
+#~ msgstr ""
+#~ "Двухфакторная аутентификация в Вашей учётной записи отключена\n"
+#~ "          Для увеличения безопасности учётки включите двухфакторную\n"
+#~ "          аутентификацию."
+
+#~ msgid "Add Phone Number"
+#~ msgstr "Добавить номер телефона"
+
+#~ msgid "Account Security"
+#~ msgstr "Безопасность учётной записи"
+
+#~ msgid "Tokens will be generated by your token generator."
+#~ msgstr "Токены будут созданы Вашим генератором токенов."
+
+#, python-format
+#~ msgid "Primary method: %(primary)s"
+#~ msgstr "Основной метод: %(primary)s"
+
+#~ msgid "Tokens will be generated by your YubiKey."
+#~ msgstr "Токены будут созданы Вашим YubiKey."
+
+#~ msgid "Backup Phone Numbers"
+#~ msgstr "Резервные номера телефонов"
+
+#~ msgid ""
+#~ "If your primary method is not available, we are able to\n"
+#~ "        send backup tokens to the phone numbers listed below."
+#~ msgstr ""
+#~ "Если Ваш основной метод будет не доступен, мы сможем\n"
+#~ "         отправить резервные токены на указанные ниже телефонные номера."
+
+#~ msgid "Unregister"
+#~ msgstr "Отменить регистрацию"
+
+#~ msgid ""
+#~ "If you don't have any device with you, you can access\n"
+#~ "        your account using backup tokens."
+#~ msgstr ""
+#~ "Если у Вас с собой нет ни одного устройства, Вы можете\n"
+#~ "        получить доступ с использованием резервных токенов."
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "        You have only one backup token remaining.\n"
+#~ "      "
+#~ msgid_plural ""
+#~ "\n"
+#~ "        You have %(counter)s backup tokens remaining.\n"
+#~ "      "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "        У Вас остался только один резервный токен.\n"
+#~ "      "
+#~ msgstr[1] ""
+#~ "\n"
+#~ "        У Вас осталось %(counter)s резервных токена.\n"
+#~ "      "
+#~ msgstr[2] ""
+#~ "\n"
+#~ "        У Вас осталось %(counter)s резервных токенов.\n"
+#~ "      "
+#~ msgstr[3] ""
+#~ "\n"
+#~ "        У Вас остался %(counter)s резервный токен.\n"
+#~ "      "
+
+#~ msgid "Show Codes"
+#~ msgstr "Показать коды"
+
+#~ msgid ""
+#~ "\n"
+#~ "        However we strongly discourage you to do so, you can\n"
+#~ "        also disable two-factor authentication for your account.\n"
+#~ "      "
+#~ msgstr ""
+#~ "\n"
+#~ "        Не смотря на то, что мы Вам рекомендуем этого не делать, Вы можете \n"
+#~ "        также отключить двухфакторную аутентификацию для своей учётной записи.\n"
+#~ "      "
+
+#~ msgid ""
+#~ "\n"
+#~ "        Two-factor authentication is not enabled for your\n"
+#~ "        account. Enable two-factor authentication for enhanced account\n"
+#~ "        security.\n"
+#~ "      "
+#~ msgstr ""
+#~ "\n"
+#~ "        Двухфакторная аутентификация для Вашей учётной записи\n"
+#~ "        не активирована. Для повышения безопасности учётной записи включите\n"
+#~ "        двухфакторную аутентификацию.\n"
+#~ "      "
+
 #~ msgid "Birthday Calendar"
 #~ msgstr "Календарь Дней Рождения"
 
@@ -3574,14 +3494,8 @@ msgstr "Кто-то уже пригласил его/её."
 #~ msgid "ICal Feeds"
 #~ msgstr "iCal-ленты"
 
-#~ msgid ""
-#~ "These are URLs for different Calendar Feeds in the iCal (.ics) format. "
-#~ "You can create as many as you want and import them in your calendar "
-#~ "software."
-#~ msgstr ""
-#~ "Здесь находятся ссылки на разные ленты календарей в формате iCal (.ics). "
-#~ "Вы можете создать их столько, сколько будет необходимо и импортировать их "
-#~ "в ПО для работы с календарями."
+#~ msgid "These are URLs for different Calendar Feeds in the iCal (.ics) format. You can create as many as you want and import them in your calendar software."
+#~ msgstr "Здесь находятся ссылки на разные ленты календарей в формате iCal (.ics). Вы можете создать их столько, сколько будет необходимо и импортировать их в ПО для работы с календарями."
 
 #~ msgid "Your iCal URLs"
 #~ msgstr "Ваши ссылки iCal"
@@ -3606,30 +3520,24 @@ msgstr "Кто-то уже пригласил его/её."
 
 #~ msgid ""
 #~ "\n"
-#~ "              This platform is powered by AlekSIS®, a web-based school "
-#~ "information system (SIS) which can be used\n"
-#~ "              to manage and/or publish organisational artifacts of "
-#~ "educational institutions. AlekSIS is free software and\n"
+#~ "              This platform is powered by AlekSIS®, a web-based school information system (SIS) which can be used\n"
+#~ "              to manage and/or publish organisational artifacts of educational institutions. AlekSIS is free software and\n"
 #~ "              can be used by anyone.\n"
 #~ "            "
 #~ msgstr ""
 #~ "\n"
-#~ "              Эта платформа использует AlekSIS®, веб-инструмент "
-#~ "информационной системы для обучения (SIS) при помощи которой\n"
-#~ "              можно управлять и/или публиковать оргинформацию учебных "
-#~ "заведений. AlekSIS - бесплатное ПО\n"
+#~ "              Эта платформа использует AlekSIS®, веб-инструмент информационной системы для обучения (SIS) при помощи которой\n"
+#~ "              можно управлять и/или публиковать оргинформацию учебных заведений. AlekSIS - бесплатное ПО\n"
 #~ "              и его может использовать любой желающий.\n"
 #~ "            "
 
 #~ msgid ""
 #~ "\n"
-#~ "              AlekSIS® is a registered trademark of the AlekSIS open "
-#~ "source project, represented by Teckids e.V.\n"
+#~ "              AlekSIS® is a registered trademark of the AlekSIS open source project, represented by Teckids e.V.\n"
 #~ "            "
 #~ msgstr ""
 #~ "\n"
-#~ "              AlekSIS® – зарегистрированная торговая марка проекта с "
-#~ "открытым исходным кодом AlekSIS, которая представлена Teckids e.V.\n"
+#~ "              AlekSIS® – зарегистрированная торговая марка проекта с открытым исходным кодом AlekSIS, которая представлена Teckids e.V.\n"
 #~ "            "
 
 #~ msgid "Website of AlekSIS"
@@ -3643,18 +3551,14 @@ msgstr "Кто-то уже пригласил его/её."
 
 #~ msgid ""
 #~ "\n"
-#~ "              The core and the official apps of AlekSIS are licenced "
-#~ "under the EUPL, version 1.2 or later. For licence\n"
-#~ "              information from third-party apps, if installed, refer to "
-#~ "the respective components below. The\n"
+#~ "              The core and the official apps of AlekSIS are licenced under the EUPL, version 1.2 or later. For licence\n"
+#~ "              information from third-party apps, if installed, refer to the respective components below. The\n"
 #~ "              licences are marked like this:\n"
 #~ "            "
 #~ msgstr ""
 #~ "\n"
-#~ "              Ядро и официальные дополнения AlekSIS лицензированы под "
-#~ "лицензией EUPL, версии 1.2 или новее. Для получения информации\n"
-#~ "              о компонентах третих сторон, если таковы установлены, "
-#~ "перейдите к соответствующим компонентам ниже.\n"
+#~ "              Ядро и официальные дополнения AlekSIS лицензированы под лицензией EUPL, версии 1.2 или новее. Для получения информации\n"
+#~ "              о компонентах третих сторон, если таковы установлены, перейдите к соответствующим компонентам ниже.\n"
 #~ "              Эти лицензии обозначены такой отметкой:\n"
 #~ "            "
 
@@ -3670,25 +3574,13 @@ msgstr "Кто-то уже пригласил его/её."
 #~ msgid "More information about the EUPL"
 #~ msgstr "Больше информации о EUPL"
 
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "                    This app is licenced under %(licence)s.\n"
-#~ "                  "
-#~ msgstr ""
-#~ "\n"
-#~ "                    Это приложение под лицензией %(licence)s.\n"
-#~ "                  "
-
 #~ msgid ""
 #~ "\n"
-#~ "              Without activated JavaScript the progress status can't be "
-#~ "updated.\n"
+#~ "              Without activated JavaScript the progress status can't be updated.\n"
 #~ "            "
 #~ msgstr ""
 #~ "\n"
-#~ "              Без активного JavaScript статус выполнения обновляться не "
-#~ "сможет.\n"
+#~ "              Без активного JavaScript статус выполнения обновляться не сможет.\n"
 #~ "            "
 
 #~ msgid "Language"
@@ -3699,14 +3591,12 @@ msgstr "Кто-то уже пригласил его/её."
 
 #~ msgid ""
 #~ "\n"
-#~ "            Your administrator account is not linked to any person. "
-#~ "Therefore,\n"
+#~ "            Your administrator account is not linked to any person. Therefore,\n"
 #~ "            a dummy person has been linked to your account.\n"
 #~ "          "
 #~ msgstr ""
 #~ "\n"
-#~ "            Ваша административная учётная запись не соединена на с одним "
-#~ "физлицом. Поэтому\n"
+#~ "            Ваша административная учётная запись не соединена на с одним физлицом. Поэтому\n"
 #~ "            к Вашей учётной записи привязано фейковое физлицо.\n"
 #~ "          "
 
@@ -3719,10 +3609,8 @@ msgstr "Кто-то уже пригласил его/её."
 #~ msgstr ""
 #~ "\n"
 #~ "            Ваша учётная запись не связана с физлицом. Это значит,\n"
-#~ "            что у Вас нет доступа на к какой учебной информации. "
-#~ "Обратитесь,\n"
-#~ "            пожалуйста, к администраторам AlekSIS в Вашем учебном "
-#~ "заведении.\n"
+#~ "            что у Вас нет доступа на к какой учебной информации. Обратитесь,\n"
+#~ "            пожалуйста, к администраторам AlekSIS в Вашем учебном заведении.\n"
 #~ "          "
 
 #~ msgid "Impersonate"
diff --git a/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po
index d81b066899e79032a2540d2433bbdd93d03dc6a9..2ceb99c7153d0eb412ca3504ce97224f6b6909fd 100644
--- a/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AlekSIS (School Information System) 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-15 20:00+0100\n"
+"POT-Creation-Date: 2023-02-27 13:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1153,15 +1153,15 @@ msgstr ""
 msgid "Country for phone number parsing"
 msgstr ""
 
-#: aleksis/core/settings.py:544
+#: aleksis/core/settings.py:549
 msgid "English"
 msgstr ""
 
-#: aleksis/core/settings.py:545
+#: aleksis/core/settings.py:550
 msgid "German"
 msgstr ""
 
-#: aleksis/core/settings.py:546
+#: aleksis/core/settings.py:551
 msgid "Ukrainian"
 msgstr ""
 
@@ -1233,19 +1233,6 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: aleksis/core/templates/503.html:10
-msgid ""
-"The maintenance mode is currently enabled. Please try again\n"
-"          later."
-msgstr ""
-
-#: aleksis/core/templates/503.html:13
-msgid ""
-"\n"
-"            This page is currently unavailable. If this error persists, contact your site administrators:\n"
-"          "
-msgstr ""
-
 #: aleksis/core/templates/account/account_inactive.html:5
 #: aleksis/core/templates/account/account_inactive.html:6
 msgid "Account inactive"
@@ -1330,7 +1317,7 @@ msgstr ""
 #: aleksis/core/templates/account/password_reset_done.html:5
 #: aleksis/core/templates/account/verification_email_required.html:5
 #: aleksis/core/templates/account/verification_email_required.html:6
-#: aleksis/core/templates/two_factor/core/login.html:100
+#: aleksis/core/templates/two_factor/core/login.html:110
 msgid "Reset password"
 msgstr ""
 
@@ -1975,6 +1962,13 @@ msgid ""
 "    "
 msgstr ""
 
+#: aleksis/core/templates/core/partials/splash_screen.html:17
+msgid ""
+"\n"
+"      The maintenance mode is currently enabled. Please try again later.\n"
+"    "
+msgstr ""
+
 #: aleksis/core/templates/core/perms/assign.html:12
 #: aleksis/core/templates/core/perms/assign.html:13
 msgid "Assign permission"
@@ -2493,15 +2487,12 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/_base_focus.html:6
-#: aleksis/core/templates/two_factor/core/otp_required.html:22
-#: aleksis/core/templates/two_factor/core/setup.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:88
+#: aleksis/core/templates/two_factor/core/otp_required.html:19
 msgid "Enable Two-Factor Authentication"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:5
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:46
 msgid "Backup Tokens"
 msgstr ""
 
@@ -2536,35 +2527,35 @@ msgid "Generate Tokens"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/login.html:6
-#: aleksis/core/templates/two_factor/core/login.html:32
-#: aleksis/core/templates/two_factor/core/login.html:95
+#: aleksis/core/templates/two_factor/core/login.html:36
+#: aleksis/core/templates/two_factor/core/login.html:105
 msgid "Login"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:27
+#: aleksis/core/templates/two_factor/core/login.html:31
 #, python-format
 msgid "Login for %(name)s"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:30
+#: aleksis/core/templates/two_factor/core/login.html:34
 msgid "Login with username and password"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:38
+#: aleksis/core/templates/two_factor/core/login.html:42
 msgid ""
 "You have no permission to view this page. Please login with an other\n"
 "                    account."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:47
+#: aleksis/core/templates/two_factor/core/login.html:51
 msgid "Please login with your account to use the external application."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:54
+#: aleksis/core/templates/two_factor/core/login.html:58
 msgid "Please login to see this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:65
+#: aleksis/core/templates/two_factor/core/login.html:69
 msgid ""
 "\n"
 "                        We are calling your phone right now, please enter the\n"
@@ -2572,23 +2563,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:70
+#: aleksis/core/templates/two_factor/core/login.html:74
+msgid ""
+"\n"
+"                        We sent you a text message, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:78
+msgid ""
+"\n"
+"                        We sent you an email, please enter the code we sent.\n"
+"                      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/login.html:82
 msgid ""
 "\n"
-"                        We sent you a text message, please enter the tokens we\n"
-"                        sent.\n"
+"                        Please use your Webauthn-compatible device to authenticate.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:75
+#: aleksis/core/templates/two_factor/core/login.html:86
 msgid ""
 "\n"
-"                        Please enter the tokens generated by your token\n"
-"                        generator.\n"
+"                        Please enter the code generated by your code generator.\n"
 "                      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:81
+#: aleksis/core/templates/two_factor/core/login.html:91
 msgid ""
 "\n"
 "                      Use this form for entering backup tokens for logging in.\n"
@@ -2597,23 +2600,23 @@ msgid ""
 "                    "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:109
+#: aleksis/core/templates/two_factor/core/login.html:119
 msgid "Device currently not available?"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:111
-msgid "Or, alternatively, use one of your backup phones:"
+#: aleksis/core/templates/two_factor/core/login.html:121
+msgid "Alternatively, use one of your other authentication methods:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:122
+#: aleksis/core/templates/two_factor/core/login.html:133
 msgid "As a last resort, you can use a backup token:"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:125
+#: aleksis/core/templates/two_factor/core/login.html:136
 msgid "Use Backup Token"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/login.html:136
+#: aleksis/core/templates/two_factor/core/login.html:147
 msgid "Use alternative login options"
 msgstr ""
 
@@ -2623,19 +2626,12 @@ msgstr ""
 
 #: aleksis/core/templates/two_factor/core/otp_required.html:10
 msgid ""
-"The page you requested, enforces users to verify using\n"
-"          two-factor authentication for security reasons. You need to enable these\n"
-"          security features in order to access this page."
+"The page you requested enforces users to verify using\n"
+"          two-factor authentication for security reasons. You need to enable this\n"
+"          security feature in order to access this page."
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/otp_required.html:14
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-"          account. Enable two-factor authentication for enhanced account\n"
-"          security."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/core/otp_required.html:19
+#: aleksis/core/templates/two_factor/core/otp_required.html:16
 msgid "Go back"
 msgstr ""
 
@@ -2658,31 +2654,35 @@ msgid ""
 msgstr ""
 
 #: aleksis/core/templates/two_factor/core/setup.html:9
+msgid "Add Two-Factor Authentication Method"
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:13
 msgid ""
 "\n"
 "        You are about to take your account security to the\n"
-"        next level. Follow the steps in this wizard to enable two-factor\n"
-"        authentication.\n"
+"        next level. Follow the steps in this wizard to add\n"
+"        a two-factor authentication method to your account.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:17
+#: aleksis/core/templates/two_factor/core/setup.html:21
 msgid ""
 "\n"
 "        Please select which authentication method you would like to use:\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:23
+#: aleksis/core/templates/two_factor/core/setup.html:27
 msgid ""
 "\n"
-"        To start using a token generator, please use your\n"
-"        favourite two factor authentication (TOTP) app to scan the QR code below.\n"
-"        Then, enter the token generated by the app.\n"
+"        To start using a code generator, please use your\n"
+"        favourite two-factor authentication (TOTP) app to scan the QR code below.\n"
+"        Then enter the token generated by the app.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:34
+#: aleksis/core/templates/two_factor/core/setup.html:38
 msgid ""
 "\n"
 "        Please enter the phone number you wish to receive the\n"
@@ -2690,7 +2690,7 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:41
+#: aleksis/core/templates/two_factor/core/setup.html:45
 msgid ""
 "\n"
 "        Please enter the phone number you wish to be called on.\n"
@@ -2698,21 +2698,28 @@ msgid ""
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:50
+#: aleksis/core/templates/two_factor/core/setup.html:52
+msgid ""
+"\n"
+"        We sent you an email, please enter the token we sent.\n"
+"      "
+msgstr ""
+
+#: aleksis/core/templates/two_factor/core/setup.html:60
 msgid ""
 "\n"
 "            We are calling your phone right now, please enter the digits you hear.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:56
+#: aleksis/core/templates/two_factor/core/setup.html:66
 msgid ""
 "\n"
-"            We sent you a text message, please enter the tokens we sent.\n"
+"            We sent you a text message, please enter the code we sent.\n"
 "          "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:63
+#: aleksis/core/templates/two_factor/core/setup.html:73
 msgid ""
 "\n"
 "          We've encountered an issue with the selected authentication method. Please\n"
@@ -2722,7 +2729,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup.html:73
+#: aleksis/core/templates/two_factor/core/setup.html:83
 msgid ""
 "\n"
 "        To identify and verify your YubiKey, please insert a\n"
@@ -2736,41 +2743,38 @@ msgstr ""
 msgid "Two-Factor Authentication successfully enabled"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:14
+#: aleksis/core/templates/two_factor/core/setup_complete.html:13
 msgid ""
 "\n"
 "        Congratulations, you've successfully enabled two-factor authentication.\n"
 "      "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:24
-#: aleksis/core/templates/two_factor/core/setup_complete.html:44
+#: aleksis/core/templates/two_factor/core/setup_complete.html:22
+#: aleksis/core/templates/two_factor/core/setup_complete.html:40
 msgid "Back to Profile"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:28
-#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+#: aleksis/core/templates/two_factor/core/setup_complete.html:26
+#: aleksis/core/templates/two_factor/core/setup_complete.html:44
 msgid "Generate backup codes"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:34
+#: aleksis/core/templates/two_factor/core/setup_complete.html:31
 msgid ""
 "\n"
 "          However, it might happen that you don't have access to\n"
-"          your primary token device. To enable account recovery, generate backup codes\n"
-"          or add a phone number.\n"
+"          your primary device. To enable account recovery, generate backup codes\n"
+"          or add other authentication methods.\n"
 "        "
 msgstr ""
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:52
-#: aleksis/core/templates/two_factor/profile/profile.html:41
-msgid "Add Phone Number"
+#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+msgid "Add Another Authentication Method"
 msgstr ""
 
 #: aleksis/core/templates/two_factor/profile/disable.html:5
 #: aleksis/core/templates/two_factor/profile/disable.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:63
-#: aleksis/core/templates/two_factor/profile/profile.html:73
 msgid "Disable Two-Factor Authentication"
 msgstr ""
 
@@ -2782,78 +2786,6 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: aleksis/core/templates/two_factor/profile/profile.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:10
-msgid "Account Security"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:15
-msgid "Tokens will be generated by your token generator."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:17
-#, python-format
-msgid "Primary method: %(primary)s"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:19
-msgid "Tokens will be generated by your YubiKey."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:23
-msgid "Backup Phone Numbers"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:24
-msgid ""
-"If your primary method is not available, we are able to\n"
-"        send backup tokens to the phone numbers listed below."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:33
-msgid "Unregister"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:48
-msgid ""
-"If you don't have any device with you, you can access\n"
-"        your account using backup tokens."
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:50
-#, python-format
-msgid ""
-"\n"
-"        You have only one backup token remaining.\n"
-"      "
-msgid_plural ""
-"\n"
-"        You have %(counter)s backup tokens remaining.\n"
-"      "
-msgstr[0] ""
-msgstr[1] ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:59
-msgid "Show Codes"
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:65
-msgid ""
-"\n"
-"        However we strongly discourage you to do so, you can\n"
-"        also disable two-factor authentication for your account.\n"
-"      "
-msgstr ""
-
-#: aleksis/core/templates/two_factor/profile/profile.html:78
-msgid ""
-"\n"
-"        Two-factor authentication is not enabled for your\n"
-"        account. Enable two-factor authentication for enhanced account\n"
-"        security.\n"
-"      "
-msgstr ""
-
 #: aleksis/core/util/notifications.py:64
 msgid "E-Mail"
 msgstr ""
@@ -2882,148 +2814,148 @@ msgstr ""
 msgid "Download PDF"
 msgstr ""
 
-#: aleksis/core/views.py:278
+#: aleksis/core/views.py:280
 msgid "The school term has been created."
 msgstr ""
 
-#: aleksis/core/views.py:290
+#: aleksis/core/views.py:292
 msgid "The school term has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:394
+#: aleksis/core/views.py:396
 msgid "The child groups were successfully saved."
 msgstr ""
 
-#: aleksis/core/views.py:413 aleksis/core/views.py:423
+#: aleksis/core/views.py:415 aleksis/core/views.py:425
 msgid "The person has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:473
+#: aleksis/core/views.py:475
 msgid "The group has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:556
+#: aleksis/core/views.py:558
 msgid "The announcement has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:572
+#: aleksis/core/views.py:574
 msgid "The announcement has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:641
+#: aleksis/core/views.py:643
 msgid "The requested preference registry does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:660
+#: aleksis/core/views.py:662
 msgid "The preferences have been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:684
+#: aleksis/core/views.py:686
 msgid "The person has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:698
+#: aleksis/core/views.py:700
 msgid "The group has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:730
+#: aleksis/core/views.py:732
 msgid "The additional field has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:765
+#: aleksis/core/views.py:767
 msgid "The additional field has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:790
+#: aleksis/core/views.py:792
 msgid "The group type has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:821
+#: aleksis/core/views.py:823
 msgid "The group type has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:856
+#: aleksis/core/views.py:858
 msgid "Progress: Run data checks"
 msgstr ""
 
-#: aleksis/core/views.py:857
+#: aleksis/core/views.py:859
 msgid "Run data checks …"
 msgstr ""
 
-#: aleksis/core/views.py:858
+#: aleksis/core/views.py:860
 msgid "The data checks were run successfully."
 msgstr ""
 
-#: aleksis/core/views.py:859
+#: aleksis/core/views.py:861
 msgid "There was a problem while running data checks."
 msgstr ""
 
-#: aleksis/core/views.py:876
+#: aleksis/core/views.py:878
 #, python-brace-format
 msgid "The solve option '{solve_option_obj.verbose_name}' "
 msgstr ""
 
-#: aleksis/core/views.py:886
+#: aleksis/core/views.py:888
 msgid "The requested solve option does not exist"
 msgstr ""
 
-#: aleksis/core/views.py:919
+#: aleksis/core/views.py:921
 msgid "The dashboard widget has been saved."
 msgstr ""
 
-#: aleksis/core/views.py:949
+#: aleksis/core/views.py:951
 msgid "The dashboard widget has been created."
 msgstr ""
 
-#: aleksis/core/views.py:959
+#: aleksis/core/views.py:961
 msgid "The dashboard widget has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1031
+#: aleksis/core/views.py:1033
 msgid "Your dashboard configuration has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1033
+#: aleksis/core/views.py:1035
 msgid "The configuration of the default dashboard has been saved successfully."
 msgstr ""
 
-#: aleksis/core/views.py:1104
+#: aleksis/core/views.py:1106
 #, python-brace-format
 msgid "The invitation was successfully created. The invitation code is {code}"
 msgstr ""
 
-#: aleksis/core/views.py:1201
+#: aleksis/core/views.py:1203
 msgid "We have successfully assigned the permissions."
 msgstr ""
 
-#: aleksis/core/views.py:1211
+#: aleksis/core/views.py:1213
 msgid "The global user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1221
+#: aleksis/core/views.py:1223
 msgid "The global group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1231
+#: aleksis/core/views.py:1233
 msgid "The object user permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1241
+#: aleksis/core/views.py:1243
 msgid "The object group permission has been deleted."
 msgstr ""
 
-#: aleksis/core/views.py:1350
+#: aleksis/core/views.py:1352
 msgid "The third-party account could not be disconnected because it is the only login method available."
 msgstr ""
 
-#: aleksis/core/views.py:1357
+#: aleksis/core/views.py:1359
 msgid "The third-party account has been successfully disconnected."
 msgstr ""
 
-#: aleksis/core/views.py:1433
+#: aleksis/core/views.py:1435
 msgid "Person was invited successfully and an email with further instructions has been send to them."
 msgstr ""
 
-#: aleksis/core/views.py:1444
+#: aleksis/core/views.py:1446
 msgid "Person was already invited."
 msgstr ""
diff --git a/aleksis/core/locale/uk/LC_MESSAGES/django.po b/aleksis/core/locale/uk/LC_MESSAGES/django.po
index 1e9d09001471473235e7347e0660f09b735954f6..2436f531c3722353bcb6f90f73a621130efeed91 100644
--- a/aleksis/core/locale/uk/LC_MESSAGES/django.po
+++ b/aleksis/core/locale/uk/LC_MESSAGES/django.po
@@ -7,19 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-22 20:49+0100\n"
+"POT-Creation-Date: 2023-02-27 13:23+0100\n"
 "PO-Revision-Date: 2023-02-08 22:40+0000\n"
 "Last-Translator: Serhii Horichenko <m@sgg.im>\n"
-"Language-Team: Ukrainian <https://translate.edugit.org/projects/aleksis/"
-"aleksis-core/uk/>\n"
+"Language-Team: Ukrainian <https://translate.edugit.org/projects/aleksis/aleksis-core/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
-"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
-"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
-"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 "X-Generator: Weblate 4.12.1\n"
 
 #: aleksis/core/apps.py:155
@@ -188,8 +184,7 @@ msgid "Write your announcement:"
 msgstr "Складіть своє оголошеня:"
 
 #: aleksis/core/forms.py:276
-msgid ""
-"You are not allowed to create announcements which are only valid in the past."
+msgid "You are not allowed to create announcements which are only valid in the past."
 msgstr "Оголошення для минулого Вам створювати не дозволено."
 
 #: aleksis/core/forms.py:280
@@ -237,10 +232,8 @@ msgid "Grant the permission for all objects"
 msgstr "Надати дозвіл до всіх об'єктів"
 
 #: aleksis/core/forms.py:494
-msgid ""
-"You must select at least one group or person which should get the permission."
-msgstr ""
-"Ви повинні обрати принаймні одну групу або особу, хто буде мати дозвіл."
+msgid "You must select at least one group or person which should get the permission."
+msgstr "Ви повинні обрати принаймні одну групу або особу, хто буде мати дозвіл."
 
 #: aleksis/core/forms.py:499
 msgid "You must grant the permission to all objects or to specific objects."
@@ -404,8 +397,7 @@ msgstr "чол"
 msgid "other"
 msgstr "інший"
 
-#: aleksis/core/models.py:189 aleksis/core/models.py:1345
-#: aleksis/core/models.py:1353
+#: aleksis/core/models.py:189 aleksis/core/models.py:1353
 msgid "Linked user"
 msgstr "Пов'язаний користувач"
 
@@ -414,7 +406,7 @@ msgid "Additional name(s)"
 msgstr "Додаткові імена"
 
 #: aleksis/core/models.py:199 aleksis/core/models.py:511
-#: aleksis/core/models.py:1431 aleksis/core/models.py:1439
+#: aleksis/core/models.py:1439
 msgid "Short name"
 msgstr "Коротке ім'я"
 
@@ -455,11 +447,8 @@ msgid "Sex"
 msgstr "Стать"
 
 #: aleksis/core/models.py:221 aleksis/core/models.py:550
-msgid ""
-"This is an official photo, used for official documents and for internal use "
-"cases."
-msgstr ""
-"Це офіційне фото, яке використовується для документів та внутрішніх потреб."
+msgid "This is an official photo, used for official documents and for internal use cases."
+msgstr "Це офіційне фото, яке використовується для документів та внутрішніх потреб."
 
 #: aleksis/core/models.py:226 aleksis/core/models.py:554
 msgid "Display picture / Avatar"
@@ -479,7 +468,7 @@ msgstr "Основна група"
 
 #: aleksis/core/models.py:244 aleksis/core/models.py:724
 #: aleksis/core/models.py:748 aleksis/core/models.py:843
-#: aleksis/core/models.py:1104 aleksis/core/models.py:1112
+#: aleksis/core/models.py:1112
 msgid "Description"
 msgstr "Опис"
 
@@ -515,8 +504,7 @@ msgstr "Може призначати підлеглі групи до груп"
 msgid "Can view statistics about group."
 msgstr "Може бачити статистику групи."
 
-#: aleksis/core/models.py:509 aleksis/core/models.py:1432
-#: aleksis/core/models.py:1440
+#: aleksis/core/models.py:509 aleksis/core/models.py:1440
 msgid "Long name"
 msgstr "Довге ім'я"
 
@@ -543,9 +531,8 @@ msgid "Additional fields"
 msgstr "Додаткові поля"
 
 #: aleksis/core/models.py:723 aleksis/core/models.py:747
-#: aleksis/core/models.py:842 aleksis/core/models.py:1262
+#: aleksis/core/models.py:842 aleksis/core/models.py:1270
 #: aleksis/core/templates/core/announcement/list.html:18
-#: aleksis/core/models.py:1270
 msgid "Title"
 msgstr "Назва"
 
@@ -574,9 +561,8 @@ msgid "Link"
 msgstr "Посилання"
 
 #: aleksis/core/models.py:752 aleksis/core/models.py:1079
-#: aleksis/core/models.py:1392
-#: aleksis/core/templates/oauth2_provider/application/detail.html:26
 #: aleksis/core/models.py:1400
+#: aleksis/core/templates/oauth2_provider/application/detail.html:26
 msgid "Icon"
 msgstr "Піктограма"
 
@@ -758,210 +744,205 @@ msgstr "Пункт користувацького меню"
 msgid "Custom menu items"
 msgstr "Пункти користувацького меню"
 
-#: aleksis/core/models.py:1103 aleksis/core/models.py:1111
+#: aleksis/core/models.py:1111
 msgid "Title of type"
 msgstr "Назва типу"
 
-#: aleksis/core/models.py:1110 aleksis/core/templates/core/group/full.html:50
-#: aleksis/core/models.py:1118
+#: aleksis/core/models.py:1118 aleksis/core/templates/core/group/full.html:50
 msgid "Group type"
 msgstr "Тип групи"
 
-#: aleksis/core/models.py:1111
+#: aleksis/core/models.py:1119
 #: aleksis/core/templates/core/group_type/list.html:8
 #: aleksis/core/templates/core/group_type/list.html:9
-#: aleksis/core/models.py:1119
 msgid "Group types"
 msgstr "Типи груп"
 
-#: aleksis/core/models.py:1124 aleksis/core/models.py:1132
+#: aleksis/core/models.py:1132
 msgid "Can view system status"
 msgstr "Може переглядати стан системи"
 
-#: aleksis/core/models.py:1125 aleksis/core/models.py:1133
+#: aleksis/core/models.py:1133
 msgid "Can manage data"
 msgstr "Може керувати даними"
 
-#: aleksis/core/models.py:1126 aleksis/core/models.py:1134
+#: aleksis/core/models.py:1134
 msgid "Can impersonate"
 msgstr "Може маскуватися"
 
-#: aleksis/core/models.py:1127 aleksis/core/models.py:1135
+#: aleksis/core/models.py:1135
 msgid "Can use search"
 msgstr "Може шукати"
 
-#: aleksis/core/models.py:1128 aleksis/core/models.py:1136
+#: aleksis/core/models.py:1136
 msgid "Can change site preferences"
 msgstr "Може змінювати властивості сайту"
 
-#: aleksis/core/models.py:1129 aleksis/core/models.py:1137
+#: aleksis/core/models.py:1137
 msgid "Can change person preferences"
 msgstr "Може змінювати властивості особи"
 
-#: aleksis/core/models.py:1130 aleksis/core/models.py:1138
+#: aleksis/core/models.py:1138
 msgid "Can change group preferences"
 msgstr "Може змінювати властивості групи"
 
-#: aleksis/core/models.py:1131 aleksis/core/models.py:1139
+#: aleksis/core/models.py:1139
 msgid "Can test PDF generation"
 msgstr "Може генерувати тестові PDF"
 
-#: aleksis/core/models.py:1132 aleksis/core/models.py:1140
+#: aleksis/core/models.py:1140
 msgid "Can invite persons"
 msgstr "Може запрошувати осіб"
 
-#: aleksis/core/models.py:1168 aleksis/core/models.py:1176
+#: aleksis/core/models.py:1176
 msgid "Related data check task"
 msgstr "Завдання перевірки пов'язаних даних"
 
-#: aleksis/core/models.py:1176 aleksis/core/models.py:1184
+#: aleksis/core/models.py:1184
 msgid "Issue solved"
 msgstr "Проблема вирішена"
 
-#: aleksis/core/models.py:1177 aleksis/core/models.py:1185
+#: aleksis/core/models.py:1185
 msgid "Notification sent"
 msgstr "Сповіщення надіслане"
 
-#: aleksis/core/models.py:1190 aleksis/core/models.py:1198
+#: aleksis/core/models.py:1198
 msgid "Data check result"
 msgstr "Результат перевірки даних"
 
-#: aleksis/core/models.py:1191 aleksis/core/models.py:1199
+#: aleksis/core/models.py:1199
 msgid "Data check results"
 msgstr "Результати перевірки даних"
 
-#: aleksis/core/models.py:1193 aleksis/core/models.py:1201
+#: aleksis/core/models.py:1201
 msgid "Can run data checks"
 msgstr "Може запускати перевірки даних"
 
-#: aleksis/core/models.py:1194 aleksis/core/models.py:1202
+#: aleksis/core/models.py:1202
 msgid "Can solve data check problems"
 msgstr "Може розв'язувати проблеми перевірки даних"
 
-#: aleksis/core/models.py:1201 aleksis/core/models.py:1209
+#: aleksis/core/models.py:1209
 msgid "E-Mail address"
 msgstr "Адреса ел.пошти"
 
-#: aleksis/core/models.py:1233 aleksis/core/models.py:1241
+#: aleksis/core/models.py:1241
 msgid "Owner"
 msgstr "Власник"
 
-#: aleksis/core/models.py:1237 aleksis/core/models.py:1245
+#: aleksis/core/models.py:1245
 msgid "File expires at"
 msgstr "Файл дійсний до"
 
-#: aleksis/core/models.py:1240 aleksis/core/models.py:1248
+#: aleksis/core/models.py:1248
 msgid "Generated HTML file"
 msgstr "Згенерований файл HTML"
 
-#: aleksis/core/models.py:1243 aleksis/core/models.py:1251
+#: aleksis/core/models.py:1251
 msgid "Generated PDF file"
 msgstr "Згенерований файл PDF"
 
-#: aleksis/core/models.py:1250 aleksis/core/models.py:1258
+#: aleksis/core/models.py:1258
 msgid "PDF file"
 msgstr "Файл PDF"
 
-#: aleksis/core/models.py:1251 aleksis/core/models.py:1259
+#: aleksis/core/models.py:1259
 msgid "PDF files"
 msgstr "Файли PDF"
 
-#: aleksis/core/models.py:1256 aleksis/core/models.py:1264
+#: aleksis/core/models.py:1264
 msgid "Task result"
 msgstr "Результат завдання"
 
-#: aleksis/core/models.py:1259 aleksis/core/models.py:1267
+#: aleksis/core/models.py:1267
 msgid "Task user"
 msgstr "Користувач завдання"
 
-#: aleksis/core/models.py:1263 aleksis/core/models.py:1271
+#: aleksis/core/models.py:1271
 msgid "Back URL"
 msgstr "URL для повернення"
 
-#: aleksis/core/models.py:1264 aleksis/core/models.py:1272
+#: aleksis/core/models.py:1272
 msgid "Progress title"
 msgstr "Назва процесу"
 
-#: aleksis/core/models.py:1265 aleksis/core/models.py:1273
+#: aleksis/core/models.py:1273
 msgid "Error message"
 msgstr "Повідомлення про помилку"
 
-#: aleksis/core/models.py:1266 aleksis/core/models.py:1274
+#: aleksis/core/models.py:1274
 msgid "Success message"
 msgstr "Повідомлення про успіх"
 
-#: aleksis/core/models.py:1267 aleksis/core/models.py:1275
+#: aleksis/core/models.py:1275
 msgid "Redirect on success URL"
 msgstr "Посилання для перенаправлення в разі успіху"
 
-#: aleksis/core/models.py:1269 aleksis/core/models.py:1277
+#: aleksis/core/models.py:1277
 msgid "Additional button title"
 msgstr "Назва додаткової кнопки"
 
-#: aleksis/core/models.py:1271 aleksis/core/models.py:1279
+#: aleksis/core/models.py:1279
 msgid "Additional button URL"
 msgstr "Посилання додаткової кнопки"
 
-#: aleksis/core/models.py:1273 aleksis/core/models.py:1281
+#: aleksis/core/models.py:1281
 msgid "Additional button icon"
 msgstr "Піктограма додаткової кнопки"
 
-#: aleksis/core/models.py:1275 aleksis/core/models.py:1283
+#: aleksis/core/models.py:1283
 msgid "Result fetched"
 msgstr "Отриманий результат"
 
-#: aleksis/core/models.py:1300 aleksis/core/models.py:1308
+#: aleksis/core/models.py:1308
 msgid "Background task completed successfully"
 msgstr "Фонове завдання успішно завершене"
 
-#: aleksis/core/models.py:1301 aleksis/core/models.py:1309
+#: aleksis/core/models.py:1309
 msgid "The background task '{}' has been completed successfully."
 msgstr "Фонове завдання '{}' було успішно завершене."
 
-#: aleksis/core/models.py:1307 aleksis/core/models.py:1315
+#: aleksis/core/models.py:1315
 msgid "Background task failed"
 msgstr "Збій фонового завдання"
 
-#: aleksis/core/models.py:1308 aleksis/core/models.py:1316
+#: aleksis/core/models.py:1316
 msgid "The background task '{}' has failed."
 msgstr "У фонового завдання '{}' стався збій."
 
-#: aleksis/core/models.py:1317 aleksis/core/models.py:1325
+#: aleksis/core/models.py:1325
 msgid "Background task"
 msgstr "Фонове завдання"
 
-#: aleksis/core/models.py:1331 aleksis/core/models.py:1339
+#: aleksis/core/models.py:1339
 msgid "Task user assignment"
 msgstr "Призначення користувача завдання"
 
-#: aleksis/core/models.py:1332 aleksis/core/models.py:1340
+#: aleksis/core/models.py:1340
 msgid "Task user assignments"
 msgstr "Призначення користувачів завдання"
 
-#: aleksis/core/models.py:1348 aleksis/core/models.py:1356
+#: aleksis/core/models.py:1356
 msgid "Additional attributes"
 msgstr "Додаткові атрибути"
 
-#: aleksis/core/models.py:1386 aleksis/core/models.py:1394
+#: aleksis/core/models.py:1394
 msgid "Allowed scopes that clients can request"
 msgstr "Дозволені межі дії, які можуть запитувати клієнти"
 
-#: aleksis/core/models.py:1396 aleksis/core/models.py:1404
-msgid ""
-"This image will be shown as icon in the authorization flow. It should be "
-"squared."
-msgstr ""
-"Це зображення буде іконкою під час авторизації. Воно повинне бути квадратним."
+#: aleksis/core/models.py:1404
+msgid "This image will be shown as icon in the authorization flow. It should be squared."
+msgstr "Це зображення буде іконкою під час авторизації. Воно повинне бути квадратним."
 
-#: aleksis/core/models.py:1441 aleksis/core/models.py:1449
+#: aleksis/core/models.py:1449
 msgid "Can view room timetable"
 msgstr "Може переглядати розклад кімнати"
 
-#: aleksis/core/models.py:1443 aleksis/core/models.py:1451
+#: aleksis/core/models.py:1451
 msgid "Room"
 msgstr "Кімната"
 
-#: aleksis/core/models.py:1444 aleksis/core/models.py:1452
+#: aleksis/core/models.py:1452
 msgid "Rooms"
 msgstr "Кімнати"
 
@@ -1074,10 +1055,8 @@ msgid "Automatically create new persons for new users"
 msgstr "Нові особи для нових користувачів створювати автоматично"
 
 #: aleksis/core/preferences.py:256
-msgid ""
-"Automatically link existing persons to new users by their e-mail address"
-msgstr ""
-"Пов'язувати існуючих осіб з новими користувачами автоматично за ел.адресами"
+msgid "Automatically link existing persons to new users by their e-mail address"
+msgstr "Пов'язувати існуючих осіб з новими користувачами автоматично за ел.адресами"
 
 #: aleksis/core/preferences.py:267
 msgid "Display name of the school"
@@ -1144,8 +1123,7 @@ msgid "Fields on person model which are editable by themselves."
 msgstr "Поля з описом особи, які можна редагувати самостійно."
 
 #: aleksis/core/preferences.py:424
-msgid ""
-"Editable fields on person model which should trigger a notification on change"
+msgid "Editable fields on person model which should trigger a notification on change"
 msgstr "Змінювані поля з описом особи, які повинні сповіщати щодо редагування"
 
 #: aleksis/core/preferences.py:438
@@ -1176,15 +1154,15 @@ msgstr "Автоматично оновлювати інформпанель т
 msgid "Country for phone number parsing"
 msgstr "Країна для розбору номера телефона"
 
-#: aleksis/core/settings.py:539 aleksis/core/settings.py:544
+#: aleksis/core/settings.py:549
 msgid "English"
 msgstr "Англійська"
 
-#: aleksis/core/settings.py:540 aleksis/core/settings.py:545
+#: aleksis/core/settings.py:550
 msgid "German"
 msgstr "Німецька"
 
-#: aleksis/core/settings.py:541 aleksis/core/settings.py:546
+#: aleksis/core/settings.py:551
 msgid "Ukrainian"
 msgstr "Українська"
 
@@ -1227,8 +1205,7 @@ msgstr ""
 #: aleksis/core/templates/403.html:19 aleksis/core/templates/404.html:16
 msgid ""
 "\n"
-"            If you think this is an error in AlekSIS, please contact your "
-"site\n"
+"            If you think this is an error in AlekSIS, please contact your site\n"
 "            administrators:\n"
 "          "
 msgstr ""
@@ -1260,14 +1237,12 @@ msgstr ""
 #: aleksis/core/templates/500.html:13
 msgid ""
 "\n"
-"            Your site administrators will automatically be notified about "
-"this\n"
+"            Your site administrators will automatically be notified about this\n"
 "            error. You can also contact them directly:\n"
 "          "
 msgstr ""
 "\n"
-"            Адміністратори сайту будуть сповіщені щодо цієї помилки "
-"автоматично.\n"
+"            Адміністратори сайту будуть сповіщені щодо цієї помилки автоматично.\n"
 "            Ви також можете звернутися до них безпосередньо:\n"
 "          "
 
@@ -1275,26 +1250,6 @@ msgstr ""
 msgid "Retry"
 msgstr "Спробувати ще"
 
-#: aleksis/core/templates/503.html:10
-msgid ""
-"The maintenance mode is currently enabled. Please try again\n"
-"          later."
-msgstr ""
-"Сайт перебуває зараз на обслуговуванні. Спробуйте зайти\n"
-"          пізніше."
-
-#: aleksis/core/templates/503.html:13
-msgid ""
-"\n"
-"            This page is currently unavailable. If this error persists, "
-"contact your site administrators:\n"
-"          "
-msgstr ""
-"\n"
-"            Ця сторінка наразі недоступна. Якщо ця помилка виникне знову, "
-"зверніться до адміністраторів сайту:\n"
-"          "
-
 #: aleksis/core/templates/account/account_inactive.html:5
 #: aleksis/core/templates/account/account_inactive.html:6
 msgid "Account inactive"
@@ -1333,22 +1288,13 @@ msgstr "Підтвердити"
 
 #: aleksis/core/templates/account/email_confirm.html:12
 #, python-format
-msgid ""
-"Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail "
-"address for user %(user_display)s."
-msgstr ""
-"Підтвердіть, будь ласка, що <a href=\"mailto:%(email)s\">%(email)s</a> є "
-"адресою ел.пошти для користувача %(user_display)s."
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr "Підтвердіть, будь ласка, що <a href=\"mailto:%(email)s\">%(email)s</a> є адресою ел.пошти для користувача %(user_display)s."
 
 #: aleksis/core/templates/account/email_confirm.html:25
 #, python-format
-msgid ""
-"This e-mail confirmation link expired or is invalid. Please <a href="
-"\"%(email_url)s\">issue a new e-mail confirmation request</a>."
-msgstr ""
-"Це посилання для підтвердження ел.пошти протерміноване або недійсне. "
-"Зробіть, будь ласка, для підтвердження <a href=\"%(email_url)s\">новий "
-"запит</a>."
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr "Це посилання для підтвердження ел.пошти протерміноване або недійсне. Зробіть, будь ласка, для підтвердження <a href=\"%(email_url)s\">новий запит</a>."
 
 #: aleksis/core/templates/account/password_change.html:5
 #: aleksis/core/templates/account/password_change.html:6
@@ -1382,14 +1328,12 @@ msgstr "Зміна паролю вимкнена."
 msgid ""
 "\n"
 "            Users are not allowed to edit their own passwords. If you think\n"
-"            this is an error please contact one of your site "
-"administrators.\n"
+"            this is an error please contact one of your site administrators.\n"
 "          "
 msgstr ""
 "\n"
 "            Користувачам не дозволяється змінювати свої паролі.\n"
-"            Якщо Ви думаєте, що це помилка, зверніться до адміністраторів "
-"сайту.\n"
+"            Якщо Ви думаєте, що це помилка, зверніться до адміністраторів сайту.\n"
 "          "
 
 #: aleksis/core/templates/account/password_reset.html:5
@@ -1398,17 +1342,13 @@ msgstr ""
 #: aleksis/core/templates/account/password_reset_done.html:5
 #: aleksis/core/templates/account/verification_email_required.html:5
 #: aleksis/core/templates/account/verification_email_required.html:6
-#: aleksis/core/templates/two_factor/core/login.html:100
+#: aleksis/core/templates/two_factor/core/login.html:110
 msgid "Reset password"
 msgstr "Скинути пароль"
 
 #: aleksis/core/templates/account/password_reset.html:17
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll send you "
-"an e-mail allowing you to reset it."
-msgstr ""
-"Забули пароль? Вкажіть нижче свою ел.пошту і ми надішлемо Вам листа для "
-"скидання пароля."
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr "Забули пароль? Вкажіть нижче свою ел.пошту і ми надішлемо Вам листа для скидання пароля."
 
 #: aleksis/core/templates/account/password_reset.html:30
 msgid ""
@@ -1432,8 +1372,7 @@ msgid ""
 msgstr ""
 "\n"
 "            Ми надіслали Вам ел.листа. Якщо Ви його не отримаєте протягом\n"
-"            декількох хвилин, зверніться, будь ласка, до адміністраторів "
-"сайту.\n"
+"            декількох хвилин, зверніться, будь ласка, до адміністраторів сайту.\n"
 "          "
 
 #: aleksis/core/templates/account/password_reset_from_key.html:15
@@ -1444,16 +1383,13 @@ msgstr "Несправний токен"
 #, python-format
 msgid ""
 "\n"
-"              The password reset link was invalid, possibly because it has "
-"already been used. Please request a <a href=\"%(passwd_reset_url)s\"\n"
+"              The password reset link was invalid, possibly because it has already been used. Please request a <a href=\"%(passwd_reset_url)s\"\n"
 "              class=\"blue-text text-lighten-2\">new password reset</a>.\n"
 "            "
 msgstr ""
 "\n"
-"              Посилання на скидання пароля недійсне або, ймовірно, вже "
-"використане. Зробіть, будь ласка, <a href=\"%(passwd_reset_url)s\"\n"
-"              class=\"blue-text text-lighten-2\">новий запит на скидання "
-"пароля</a>.\n"
+"              Посилання на скидання пароля недійсне або, ймовірно, вже використане. Зробіть, будь ласка, <a href=\"%(passwd_reset_url)s\"\n"
+"              class=\"blue-text text-lighten-2\">новий запит на скидання пароля</a>.\n"
 "            "
 
 #: aleksis/core/templates/account/password_reset_from_key.html:25
@@ -1502,10 +1438,8 @@ msgstr "Реєстрація"
 
 #: aleksis/core/templates/account/signup.html:12
 #, python-format
-msgid ""
-"Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
-msgstr ""
-"Вже маєте обліковий запис? Тоді можете <a href=\"%(login_url)s\">увіти</a>."
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr "Вже маєте обліковий запис? Тоді можете <a href=\"%(login_url)s\">увіти</a>."
 
 #: aleksis/core/templates/account/signup.html:22
 #: aleksis/core/templates/socialaccount/signup.html:23
@@ -1549,17 +1483,13 @@ msgstr "Перевірте свою ел.пошту!"
 #: aleksis/core/templates/account/verification_sent.html:16
 msgid ""
 "\n"
-"            This part of the site requires us to verify that you are who you "
-"claim to be.\n"
-"            For this purpose, we require that you verify ownership of your e-"
-"mail address.\n"
+"            This part of the site requires us to verify that you are who you claim to be.\n"
+"            For this purpose, we require that you verify ownership of your e-mail address.\n"
 "          "
 msgstr ""
 "\n"
-"            Ця частина сайту вимагає перевірки, що Ви - саме той/та, хто має "
-"бути.\n"
-"            Саме для цього нам необхідно перевірити, що адреса ел.пошти "
-"належить саме Вам.\n"
+"            Ця частина сайту вимагає перевірки, що Ви - саме той/та, хто має бути.\n"
+"            Саме для цього нам необхідно перевірити, що адреса ел.пошти належить саме Вам.\n"
 "          "
 
 #: aleksis/core/templates/account/verification_sent.html:22
@@ -1572,10 +1502,8 @@ msgid ""
 msgstr ""
 "\n"
 "            Ми надіслали Вам для перевірки ел.листа.\n"
-"            Будь ласка, перейдіть за вказаним там посиланням. Якщо Ви не "
-"отримаєте\n"
-"            листа протягом декількох хвилин, зверніться, будь ласка, до "
-"нас.\n"
+"            Будь ласка, перейдіть за вказаним там посиланням. Якщо Ви не отримаєте\n"
+"            листа протягом декількох хвилин, зверніться, будь ласка, до нас.\n"
 "          "
 
 #: aleksis/core/templates/core/additional_field/edit.html:6
@@ -1750,39 +1678,29 @@ msgstr "Редагувати інформпанель"
 #: aleksis/core/templates/core/edit_dashboard.html:24
 msgid ""
 "\n"
-"          On this page you can arrange your personal dashboard. You can drag "
-"any items from \"Available widgets\" to \"Your\n"
-"          Dashboard\" or change the order by moving the widgets. After you "
-"have finished, please don't forget to click on\n"
+"          On this page you can arrange your personal dashboard. You can drag any items from \"Available widgets\" to \"Your\n"
+"          Dashboard\" or change the order by moving the widgets. After you have finished, please don't forget to click on\n"
 "          \"Save\".\n"
 "        "
 msgstr ""
 "\n"
-"          На цій сторінці Ви можете впорядкувати свою інформпанель. "
-"Перетягуйте будь-які елементи з \"Доступних віджетів\"\n"
-"          до \"Своєї інформпанелі\" або змінюйте порядок, перетягуючи "
-"віджети. Після закінчення не забудьте натиснути\n"
+"          На цій сторінці Ви можете впорядкувати свою інформпанель. Перетягуйте будь-які елементи з \"Доступних віджетів\"\n"
+"          до \"Своєї інформпанелі\" або змінюйте порядок, перетягуючи віджети. Після закінчення не забудьте натиснути\n"
 "          \"Зберегти\".\n"
 "        "
 
 #: aleksis/core/templates/core/edit_dashboard.html:30
 msgid ""
 "\n"
-"          On this page you can arrange the default dashboard which is shown "
-"when a user doesn't arrange his own\n"
-"          dashboard. You can drag any items from \"Available widgets\" to "
-"\"Default Dashboard\" or change the order\n"
-"          by moving the widgets. After you have finished, please don't "
-"forget to click on \"Save\".\n"
+"          On this page you can arrange the default dashboard which is shown when a user doesn't arrange his own\n"
+"          dashboard. You can drag any items from \"Available widgets\" to \"Default Dashboard\" or change the order\n"
+"          by moving the widgets. After you have finished, please don't forget to click on \"Save\".\n"
 "        "
 msgstr ""
 "\n"
-"          На цій сторінці Ви можете впорядкувати типову/стандартну "
-"інформпанель, яка відображається, якщо користувач\n"
-"          не впорядкував власну. Перетягуйте будь-які елементи з \"Доступних "
-"віджетів\" до \"Типової інформпанелі\" або змінюйте \n"
-"          порядок, перетягуючи віджети. Після закінчення не забудьте "
-"натиснути \"Зберегти\".\n"
+"          На цій сторінці Ви можете впорядкувати типову/стандартну інформпанель, яка відображається, якщо користувач\n"
+"          не впорядкував власну. Перетягуйте будь-які елементи з \"Доступних віджетів\" до \"Типової інформпанелі\" або змінюйте \n"
+"          порядок, перетягуючи віджети. Після закінчення не забудьте натиснути \"Зберегти\".\n"
 "        "
 
 #: aleksis/core/templates/core/edit_dashboard.html:48
@@ -1805,16 +1723,13 @@ msgstr "Призначити підлеглі групи до груп"
 #: aleksis/core/templates/core/group/child_groups.html:18
 msgid ""
 "\n"
-"          You can use this to assign child groups to groups. Please use the "
-"filters below to select groups you want to\n"
+"          You can use this to assign child groups to groups. Please use the filters below to select groups you want to\n"
 "          change and click \"Next\".\n"
 "        "
 msgstr ""
 "\n"
-"          Ви можете скористатися цим для призначення підлеглих груп до "
-"основних. Для обрання груп,\n"
-"          які хочете змінити, скористайтеся, будь ласка, фільтрами, що нижче "
-"та натисність \"Далі\".\n"
+"          Ви можете скористатися цим для призначення підлеглих груп до основних. Для обрання груп,\n"
+"          які хочете змінити, скористайтеся, будь ласка, фільтрами, що нижче та натисність \"Далі\".\n"
 "        "
 
 #: aleksis/core/templates/core/group/child_groups.html:31
@@ -1840,8 +1755,7 @@ msgid ""
 "          "
 msgstr ""
 "\n"
-"            Оберіть, будь ласка, декілька груп у порядку, за яким "
-"призначати.\n"
+"            Оберіть, будь ласка, декілька груп у порядку, за яким призначати.\n"
 "          "
 
 #: aleksis/core/templates/core/group/child_groups.html:72
@@ -1855,18 +1769,14 @@ msgstr "Обережно, будь ласка!"
 #: aleksis/core/templates/core/group/child_groups.html:79
 msgid ""
 "\n"
-"            If you click \"Back\" or \"Next\" the current group assignments "
-"are not saved.\n"
-"            If you click \"Save\", you will overwrite all existing child "
-"group relations for this group with what you\n"
+"            If you click \"Back\" or \"Next\" the current group assignments are not saved.\n"
+"            If you click \"Save\", you will overwrite all existing child group relations for this group with what you\n"
 "            selected on this page.\n"
 "          "
 msgstr ""
 "\n"
-"            Якщо натиснете \"Назад\" або \"Далі\" призначення цієї групи не "
-"збережуться.\n"
-"            Якщо натиснете \"Зберегти\", усі існуючі зв'язки підлеглої групи "
-"з цією групою будуть замінені на\n"
+"            Якщо натиснете \"Назад\" або \"Далі\" призначення цієї групи не збережуться.\n"
+"            Якщо натиснете \"Зберегти\", усі існуючі зв'язки підлеглої групи з цією групою будуть замінені на\n"
 "            обрані на цій сторінці.\n"
 "          "
 
@@ -1964,14 +1874,12 @@ msgstr "Додому"
 #: aleksis/core/templates/core/index.html:34
 msgid ""
 "\n"
-"        You didn't customise your dashboard so that you see the system "
-"default. Please click on \"Edit dashboard\" to\n"
+"        You didn't customise your dashboard so that you see the system default. Please click on \"Edit dashboard\" to\n"
 "        customise your personal dashboard.\n"
 "      "
 msgstr ""
 "\n"
-"        Ви ще не налаштували свою інформпанель, тож поки що бачите типову/"
-"стандартну. Для налаштування \n"
+"        Ви ще не налаштували свою інформпанель, тож поки що бачите типову/стандартну. Для налаштування \n"
 "         власної інформпанелі клацніть \"Редагувати інформпанель\".\n"
 "      "
 
@@ -2015,13 +1923,11 @@ msgstr "Активований режим обслуговування"
 #: aleksis/core/templates/core/pages/system_status.html:24
 msgid ""
 "\n"
-"                Only admin and visitors from internal IPs can access the "
-"site.\n"
+"                Only admin and visitors from internal IPs can access the site.\n"
 "              "
 msgstr ""
 "\n"
-"                Доступ до сайту мають лише адміністратор та відвідувачі з "
-"внутрішніми IP-адресами.\n"
+"                Доступ до сайту мають лише адміністратор та відвідувачі з внутрішніми IP-адресами.\n"
 "              "
 
 #: aleksis/core/templates/core/pages/system_status.html:36
@@ -2039,13 +1945,11 @@ msgstr "Активований режим налагодження"
 #: aleksis/core/templates/core/pages/system_status.html:49
 msgid ""
 "\n"
-"                The web server throws back debug information on errors. Do "
-"not use in production!\n"
+"                The web server throws back debug information on errors. Do not use in production!\n"
 "              "
 msgstr ""
 "\n"
-"                Веб-сервер кидає під час помилок інформацію щодо "
-"налагодження. Не використовуйте в продакшені!\n"
+"                Веб-сервер кидає під час помилок інформацію щодо налагодження. Не використовуйте в продакшені!\n"
 "              "
 
 #: aleksis/core/templates/core/pages/system_status.html:56
@@ -2055,13 +1959,11 @@ msgstr "Режим налагодження деактивований"
 #: aleksis/core/templates/core/pages/system_status.html:58
 msgid ""
 "\n"
-"                Debug mode is disabled. Default error pages are displayed on "
-"errors.\n"
+"                Debug mode is disabled. Default error pages are displayed on errors.\n"
 "              "
 msgstr ""
 "\n"
-"                Режим налагодження деактивований. В разі збоїв "
-"відображатимуться типові сторінки помилок.\n"
+"                Режим налагодження деактивований. В разі збоїв відображатимуться типові сторінки помилок.\n"
 "              "
 
 #: aleksis/core/templates/core/pages/system_status.html:71
@@ -2111,13 +2013,11 @@ msgstr "Спроба генерації PDF"
 #: aleksis/core/templates/core/pages/test_pdf.html:14
 msgid ""
 "\n"
-"        This simple view can be used to ensure the correct function of the "
-"built-in PDF generation system.\n"
+"        This simple view can be used to ensure the correct function of the built-in PDF generation system.\n"
 "      "
 msgstr ""
 "\n"
-"        Цей простий вигляд допоможе перевірити коректність налаштувань "
-"вбудованої системи генерації PDF.\n"
+"        Цей простий вигляд допоможе перевірити коректність налаштувань вбудованої системи генерації PDF.\n"
 "      "
 
 #: aleksis/core/templates/core/partials/announcements.html:8
@@ -2175,15 +2075,26 @@ msgstr "Невідомо"
 #: aleksis/core/templates/core/partials/splash_screen.html:11
 msgid ""
 "\n"
-"      This webbrowser doesn't support JavaScript, or its execution is "
-"blocked. Please use another browser to continue.\n"
+"      This webbrowser doesn't support JavaScript, or its execution is blocked. Please use another browser to continue.\n"
 "    "
 msgstr ""
 "\n"
-"      Цей веб-браузер не підтримує JavaScript або його обробка заблокована. "
-"Для продовження скористайтеся, будь ласка, іншим браузером.\n"
+"      Цей веб-браузер не підтримує JavaScript або його обробка заблокована. Для продовження скористайтеся, будь ласка, іншим браузером.\n"
 "    "
 
+#: aleksis/core/templates/core/partials/splash_screen.html:17
+#, fuzzy
+#| msgid ""
+#| "The maintenance mode is currently enabled. Please try again\n"
+#| "          later."
+msgid ""
+"\n"
+"      The maintenance mode is currently enabled. Please try again later.\n"
+"    "
+msgstr ""
+"Сайт перебуває зараз на обслуговуванні. Спробуйте зайти\n"
+"          пізніше."
+
 #: aleksis/core/templates/core/perms/assign.html:12
 #: aleksis/core/templates/core/perms/assign.html:13
 msgid "Assign permission"
@@ -2294,9 +2205,7 @@ msgid "The invite feature is disabled."
 msgstr "Функція запрошення деактивована."
 
 #: aleksis/core/templates/invitations/disabled.html:15
-msgid ""
-"To enable it, switch on the corresponding checkbox in the authentication "
-"section of the "
+msgid "To enable it, switch on the corresponding checkbox in the authentication section of the "
 msgstr "Для активації увімкніть відповідний чекбокс в розділі авторизації на "
 
 #: aleksis/core/templates/invitations/disabled.html:16
@@ -2469,18 +2378,14 @@ msgstr "Сторінка в автономному режимі не досту
 #: aleksis/core/templates/offline.html:14
 msgid ""
 "\n"
-"      This page is not available offline. Since you probably don't have an "
-"internet connection, check to see if your WiFi\n"
-"      or mobile data is turned on and try again. If you think you are "
-"connected, please contact the system\n"
+"      This page is not available offline. Since you probably don't have an internet connection, check to see if your WiFi\n"
+"      or mobile data is turned on and try again. If you think you are connected, please contact the system\n"
 "      administrators:\n"
 "    "
 msgstr ""
 "\n"
-"      Ця сторінка в автономному режимі не доступна. Можливо, у Вас проблема "
-"з інтернетом. Переконайтеся, що Ваш WiFi\n"
-"      або мобільний інтернет увімкнені та спробуйте ще раз. Якщо Ви думаєте, "
-"що із з'єднанням все добре, зверніться\n"
+"      Ця сторінка в автономному режимі не доступна. Можливо, у Вас проблема з інтернетом. Переконайтеся, що Ваш WiFi\n"
+"      або мобільний інтернет увімкнені та спробуйте ще раз. Якщо Ви думаєте, що із з'єднанням все добре, зверніться\n"
 "      до системних адміністраторів:\n"
 "    "
 
@@ -2516,14 +2421,12 @@ msgstr "Помилка входу облікового запису третьо
 #: aleksis/core/templates/socialaccount/authentication_error.html:15
 msgid ""
 "\n"
-"            An error occurred while attempting to login via your third-party "
-"account.\n"
+"            An error occurred while attempting to login via your third-party account.\n"
 "            Please contact one of your site administrators.\n"
 "          "
 msgstr ""
 "\n"
-"            Під час спроби входу з Вашим стороннім обліковим записом виникла "
-"помилка входу.\n"
+"            Під час спроби входу з Вашим стороннім обліковим записом виникла помилка входу.\n"
 "            Зверніться, будь ласка, до адміністратора сайту.\n"
 "          "
 
@@ -2538,9 +2441,7 @@ msgstr "Видалити"
 
 #: aleksis/core/templates/socialaccount/connections.html:34
 msgid "You currently have no third-party accounts connected to this account."
-msgstr ""
-"Зараз у Вас немає облікових записів третіх сторін, з'єднаних з цим обліковим "
-"записом."
+msgstr "Зараз у Вас немає облікових записів третіх сторін, з'єднаних з цим обліковим записом."
 
 #: aleksis/core/templates/socialaccount/connections.html:37
 msgid "Add a Third-party Account"
@@ -2554,8 +2455,7 @@ msgstr "Ви приєднуєте новий обліковий запис тр
 #: aleksis/core/templates/socialaccount/login.html:23
 #, python-format
 msgid "You are about to sign in using a third party account from %(provider)s."
-msgstr ""
-"Ви авторизуєтеся за допомогою стороннього облікового запису від %(provider)s."
+msgstr "Ви авторизуєтеся за допомогою стороннього облікового запису від %(provider)s."
 
 #: aleksis/core/templates/socialaccount/login.html:28
 msgid "Continue"
@@ -2571,15 +2471,11 @@ msgstr "Вхід скасований"
 #, python-format
 msgid ""
 "\n"
-"            You decided to cancel logging in to our site using one of your "
-"existing accounts. If this was a mistake, please proceed to <a href="
-"\"%(login_url)s\">sign in</a>.\n"
+"            You decided to cancel logging in to our site using one of your existing accounts. If this was a mistake, please proceed to <a href=\"%(login_url)s\">sign in</a>.\n"
 "          "
 msgstr ""
 "\n"
-"            Схоже, що Ви скасували вхід до нашого сайту з одним із Ваших "
-"облікових записів. Якщо це сталося помилково, Ви можете <a href="
-"\"%(login_url)s\">продовжити вхід тут</a>.\n"
+"            Схоже, що Ви скасували вхід до нашого сайту з одним із Ваших облікових записів. Якщо це сталося помилково, Ви можете <a href=\"%(login_url)s\">продовжити вхід тут</a>.\n"
 "          "
 
 #: aleksis/core/templates/socialaccount/signup.html:12
@@ -2589,8 +2485,7 @@ msgid ""
 "        %(site_name)s. As a final step, please complete the following form:"
 msgstr ""
 "Ви на шляху до використання свого облікового запису у %(provider_name)s\n"
-"        для входу на %(site_name)s. Заповніть, будь ласка, для завершення цю "
-"форму:"
+"        для входу на %(site_name)s. Заповніть, будь ласка, для завершення цю форму:"
 
 #: aleksis/core/templates/socialaccount/snippets/provider_list.html:12
 #, python-format
@@ -2677,25 +2572,21 @@ msgstr "Система виявила деякі нові проблеми з В
 #: aleksis/core/templates/templated_email/data_checks.email:6
 msgid ""
 "the system detected some new problems with your data.\n"
-"Please take some time to inspect them and solve the issues or mark them as "
-"ignored."
+"Please take some time to inspect them and solve the issues or mark them as ignored."
 msgstr ""
 "система виявила деякі нові проблеми з Вашими даними.\n"
-"Приділіть, будь ласка, трохи часу для їх перевірки та вирішення проблем або "
-"позначте їх для ігнору."
+"Приділіть, будь ласка, трохи часу для їх перевірки та вирішення проблем або позначте їх для ігнору."
 
 #: aleksis/core/templates/templated_email/data_checks.email:15
 msgid ""
 "\n"
 "   the system detected some new problems with your data.\n"
-"   Please take some time to inspect them and solve the issues or mark them "
-"as ignored.\n"
+"   Please take some time to inspect them and solve the issues or mark them as ignored.\n"
 "  "
 msgstr ""
 "\n"
 "   система виявила деякі нові проблеми з Вашими даними.\n"
-"   Приділіть, будь ласка, трохи часу для їх перевірки та вирішення проблем "
-"або позначте їх для ігнору.\n"
+"   Приділіть, будь ласка, трохи часу для їх перевірки та вирішення проблем або позначте їх для ігнору.\n"
 "  "
 
 #: aleksis/core/templates/templated_email/data_checks.email:23
@@ -2764,15 +2655,12 @@ msgstr ""
 "  "
 
 #: aleksis/core/templates/two_factor/_base_focus.html:6
-#: aleksis/core/templates/two_factor/core/otp_required.html:22
-#: aleksis/core/templates/two_factor/core/setup.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:88
+#: aleksis/core/templates/two_factor/core/otp_required.html:19
 msgid "Enable Two-Factor Authentication"
 msgstr "Увімкнути двох-факторну автентифікацію"
 
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:5
 #: aleksis/core/templates/two_factor/core/backup_tokens.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:46
 msgid "Backup Tokens"
 msgstr "Резервні Токени"
 
@@ -2781,22 +2669,16 @@ msgid ""
 "\n"
 "        Backup tokens can be used when your primary and backup\n"
 "        phone numbers aren't available. The backup tokens below can be used\n"
-"        for login verification. If you've used up all your backup tokens, "
-"you\n"
-"        can generate a new set of backup tokens. Only the backup tokens "
-"shown\n"
+"        for login verification. If you've used up all your backup tokens, you\n"
+"        can generate a new set of backup tokens. Only the backup tokens shown\n"
 "        below will be valid.\n"
 "      "
 msgstr ""
 "\n"
-"        Резервні токени можуть бути використані коли Ваші основний та "
-"резервний\n"
-"        телефонні номери не доступні. Резервні токени, що нижче, можуть бути "
-"використані\n"
-"        для перевірки на вході. Коли Ви використаєте усі резервні токени, "
-"Ви\n"
-"        зможете згенерувати новий набір резервних токенів. Дійсними будуть "
-"лише токени,\n"
+"        Резервні токени можуть бути використані коли Ваші основний та резервний\n"
+"        телефонні номери не доступні. Резервні токени, що нижче, можуть бути використані\n"
+"        для перевірки на вході. Коли Ви використаєте усі резервні токени, Ви\n"
+"        зможете згенерувати новий набір резервних токенів. Дійсними будуть лише токени,\n"
 "        що нижче.\n"
 "      "
 
@@ -2823,21 +2705,21 @@ msgid "Generate Tokens"
 msgstr "Створити Токени"
 
 #: aleksis/core/templates/two_factor/core/login.html:6
-#: aleksis/core/templates/two_factor/core/login.html:32
-#: aleksis/core/templates/two_factor/core/login.html:95
+#: aleksis/core/templates/two_factor/core/login.html:36
+#: aleksis/core/templates/two_factor/core/login.html:105
 msgid "Login"
 msgstr "Увійти"
 
-#: aleksis/core/templates/two_factor/core/login.html:27
+#: aleksis/core/templates/two_factor/core/login.html:31
 #, python-format
 msgid "Login for %(name)s"
 msgstr "Увійти для %(name)s"
 
-#: aleksis/core/templates/two_factor/core/login.html:30
+#: aleksis/core/templates/two_factor/core/login.html:34
 msgid "Login with username and password"
 msgstr "Увійдіть за допомогою логіна та пароля"
 
-#: aleksis/core/templates/two_factor/core/login.html:38
+#: aleksis/core/templates/two_factor/core/login.html:42
 msgid ""
 "You have no permission to view this page. Please login with an other\n"
 "                    account."
@@ -2845,49 +2727,85 @@ msgstr ""
 "Ви не маєте дозволу на перегляд цієї сторінки. Увійдіть, будь ласка,\n"
 "                    з іншим обліковим записом."
 
-#: aleksis/core/templates/two_factor/core/login.html:47
+#: aleksis/core/templates/two_factor/core/login.html:51
 msgid "Please login with your account to use the external application."
-msgstr ""
-"Для використання зовнішнього додатку увійдіть, будь ласка, у свій обліковий "
-"запис."
+msgstr "Для використання зовнішнього додатку увійдіть, будь ласка, у свій обліковий запис."
 
-#: aleksis/core/templates/two_factor/core/login.html:54
+#: aleksis/core/templates/two_factor/core/login.html:58
 msgid "Please login to see this page."
 msgstr "Для перегляду цієї сторінки, будь ласка, увійдіть."
 
-#: aleksis/core/templates/two_factor/core/login.html:65
+#: aleksis/core/templates/two_factor/core/login.html:69
 msgid ""
 "\n"
-"                        We are calling your phone right now, please enter "
-"the\n"
+"                        We are calling your phone right now, please enter the\n"
 "                        digits you hear.\n"
 "                      "
 msgstr ""
 "\n"
-"                        Ми зателефонуємо зараз на Ваш номер. Напишіть, будь "
-"ласка, цифри,\n"
+"                        Ми зателефонуємо зараз на Ваш номер. Напишіть, будь ласка, цифри,\n"
 "                        які Ви почуєте.\n"
 "                      "
 
-#: aleksis/core/templates/two_factor/core/login.html:70
+#: aleksis/core/templates/two_factor/core/login.html:74
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                        We sent you a text message, please enter the tokens we\n"
+#| "                        sent.\n"
+#| "                      "
 msgid ""
 "\n"
-"                        We sent you a text message, please enter the tokens "
-"we\n"
-"                        sent.\n"
+"                        We sent you a text message, please enter the code we sent.\n"
 "                      "
 msgstr ""
 "\n"
-"                        Ми надіслали Вам текстове повідомлення. Напишіть, "
-"будь ласка, отриманий\n"
+"                        Ми надіслали Вам текстове повідомлення. Напишіть, будь ласка, отриманий\n"
 "                        токен.\n"
 "                      "
 
-#: aleksis/core/templates/two_factor/core/login.html:75
+#: aleksis/core/templates/two_factor/core/login.html:78
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                        We sent you a text message, please enter the tokens we\n"
+#| "                        sent.\n"
+#| "                      "
 msgid ""
 "\n"
-"                        Please enter the tokens generated by your token\n"
-"                        generator.\n"
+"                        We sent you an email, please enter the code we sent.\n"
+"                      "
+msgstr ""
+"\n"
+"                        Ми надіслали Вам текстове повідомлення. Напишіть, будь ласка, отриманий\n"
+"                        токен.\n"
+"                      "
+
+#: aleksis/core/templates/two_factor/core/login.html:82
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                    This app is licenced under %(licence)s.\n"
+#| "                  "
+msgid ""
+"\n"
+"                        Please use your Webauthn-compatible device to authenticate.\n"
+"                      "
+msgstr ""
+"\n"
+"                    Цей додаток ліцензований під %(licence)s.\n"
+"                  "
+
+#: aleksis/core/templates/two_factor/core/login.html:86
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                        Please enter the tokens generated by your token\n"
+#| "                        generator.\n"
+#| "                      "
+msgid ""
+"\n"
+"                        Please enter the code generated by your code generator.\n"
 "                      "
 msgstr ""
 "\n"
@@ -2895,43 +2813,39 @@ msgstr ""
 "                        генератора токенів.\n"
 "                      "
 
-#: aleksis/core/templates/two_factor/core/login.html:81
+#: aleksis/core/templates/two_factor/core/login.html:91
 msgid ""
 "\n"
-"                      Use this form for entering backup tokens for logging "
-"in.\n"
-"                      These tokens have been generated for you to print and "
-"keep safe. Please\n"
-"                      enter one of these backup tokens to login to your "
-"account.\n"
+"                      Use this form for entering backup tokens for logging in.\n"
+"                      These tokens have been generated for you to print and keep safe. Please\n"
+"                      enter one of these backup tokens to login to your account.\n"
 "                    "
 msgstr ""
 "\n"
-"                      Для входу скористайтеся формою для введення резервних "
-"токенів.\n"
-"                      Ці токени були згенеровані, щоб Ви їх роздрукували та "
-"зберігали у надійному місці.\n"
-"                      Щоб увійти напишіть, будь ласка, один з резервних "
-"токенів.\n"
+"                      Для входу скористайтеся формою для введення резервних токенів.\n"
+"                      Ці токени були згенеровані, щоб Ви їх роздрукували та зберігали у надійному місці.\n"
+"                      Щоб увійти напишіть, будь ласка, один з резервних токенів.\n"
 "                    "
 
-#: aleksis/core/templates/two_factor/core/login.html:109
+#: aleksis/core/templates/two_factor/core/login.html:119
 msgid "Device currently not available?"
 msgstr "Зараз пристрій недоступний?"
 
-#: aleksis/core/templates/two_factor/core/login.html:111
-msgid "Or, alternatively, use one of your backup phones:"
+#: aleksis/core/templates/two_factor/core/login.html:121
+#, fuzzy
+#| msgid "Or, alternatively, use one of your backup phones:"
+msgid "Alternatively, use one of your other authentication methods:"
 msgstr "Або можете скористатися одним зі своїх резервних телефонів:"
 
-#: aleksis/core/templates/two_factor/core/login.html:122
+#: aleksis/core/templates/two_factor/core/login.html:133
 msgid "As a last resort, you can use a backup token:"
 msgstr "В якості останньої можливості можете скористатися резервним токеном:"
 
-#: aleksis/core/templates/two_factor/core/login.html:125
+#: aleksis/core/templates/two_factor/core/login.html:136
 msgid "Use Backup Token"
 msgstr "Скористатися резервним токеном"
 
-#: aleksis/core/templates/two_factor/core/login.html:136
+#: aleksis/core/templates/two_factor/core/login.html:147
 msgid "Use alternative login options"
 msgstr "Скористайтеся альтернативними можливостями для входу"
 
@@ -2940,30 +2854,21 @@ msgid "Permission Denied"
 msgstr "Дозвіл відсутній"
 
 #: aleksis/core/templates/two_factor/core/otp_required.html:10
+#, fuzzy
+#| msgid ""
+#| "The page you requested, enforces users to verify using\n"
+#| "          two-factor authentication for security reasons. You need to enable these\n"
+#| "          security features in order to access this page."
 msgid ""
-"The page you requested, enforces users to verify using\n"
-"          two-factor authentication for security reasons. You need to enable "
-"these\n"
-"          security features in order to access this page."
-msgstr ""
-"Для перегляду запитуванної сторінки, з огляду на безпеку, необхідна "
-"додаткова\n"
-"          перевірка користувача з використанням двохфакторної "
-"автентифікації.\n"
-"          Для доступу до цієї сторінки Вам потрібно увімкнути ці функції "
-"безпеки."
-
-#: aleksis/core/templates/two_factor/core/otp_required.html:14
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-"          account. Enable two-factor authentication for enhanced account\n"
-"          security."
+"The page you requested enforces users to verify using\n"
+"          two-factor authentication for security reasons. You need to enable this\n"
+"          security feature in order to access this page."
 msgstr ""
-"Двохфакторна автентифікація у Вашому обліковому записі\n"
-"          вимкнена. Для збільшення безпеки обліковки увімкніть двохфакторну\n"
-"          автентифікацію."
+"Для перегляду запитуванної сторінки, з огляду на безпеку, необхідна додаткова\n"
+"          перевірка користувача з використанням двохфакторної автентифікації.\n"
+"          Для доступу до цієї сторінки Вам потрібно увімкнути ці функції безпеки."
 
-#: aleksis/core/templates/two_factor/core/otp_required.html:19
+#: aleksis/core/templates/two_factor/core/otp_required.html:16
 msgid "Go back"
 msgstr "Назад"
 
@@ -2991,49 +2896,64 @@ msgstr ""
 "      будь ласка, отриманий токен."
 
 #: aleksis/core/templates/two_factor/core/setup.html:9
+#, fuzzy
+#| msgid "Enable Two-Factor Authentication"
+msgid "Add Two-Factor Authentication Method"
+msgstr "Увімкнути двох-факторну автентифікацію"
+
+#: aleksis/core/templates/two_factor/core/setup.html:13
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "        You are about to take your account security to the\n"
+#| "        next level. Follow the steps in this wizard to enable two-factor\n"
+#| "        authentication.\n"
+#| "      "
 msgid ""
 "\n"
 "        You are about to take your account security to the\n"
-"        next level. Follow the steps in this wizard to enable two-factor\n"
-"        authentication.\n"
+"        next level. Follow the steps in this wizard to add\n"
+"        a two-factor authentication method to your account.\n"
 "      "
 msgstr ""
 "\n"
 "        Ви встановлюєте для свого облікового запису новий рівень безпеки.\n"
-"        Для увімкнення двохфакторної автентифікації пройдіть декілька "
-"кроків\n"
+"        Для увімкнення двохфакторної автентифікації пройдіть декілька кроків\n"
 "        майстра налаштування.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:17
+#: aleksis/core/templates/two_factor/core/setup.html:21
 msgid ""
 "\n"
 "        Please select which authentication method you would like to use:\n"
 "      "
 msgstr ""
 "\n"
-"        Оберіть, будь ласка, метод автентифікації, який Ви хочете "
-"використовувати:\n"
+"        Оберіть, будь ласка, метод автентифікації, який Ви хочете використовувати:\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:23
+#: aleksis/core/templates/two_factor/core/setup.html:27
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "        To start using a token generator, please use your\n"
+#| "        favourite two factor authentication (TOTP) app to scan the QR code below.\n"
+#| "        Then, enter the token generated by the app.\n"
+#| "      "
 msgid ""
 "\n"
-"        To start using a token generator, please use your\n"
-"        favourite two factor authentication (TOTP) app to scan the QR code "
-"below.\n"
-"        Then, enter the token generated by the app.\n"
+"        To start using a code generator, please use your\n"
+"        favourite two-factor authentication (TOTP) app to scan the QR code below.\n"
+"        Then enter the token generated by the app.\n"
 "      "
 msgstr ""
 "\n"
-"        Для того, щоби почати використання генератора токенів, скористйтеся, "
-"будь ласка, своїм\n"
-"        улюбленим додатком для двохфакторної автентифікації (TOTP) та "
-"відскануйте QR-код, що нижче.\n"
+"        Для того, щоби почати використання генератора токенів, скористйтеся, будь ласка, своїм\n"
+"        улюбленим додатком для двохфакторної автентифікації (TOTP) та відскануйте QR-код, що нижче.\n"
 "        Після цього напишіть отриманий генератором токен.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:34
+#: aleksis/core/templates/two_factor/core/setup.html:38
 msgid ""
 "\n"
 "        Please enter the phone number you wish to receive the\n"
@@ -3042,11 +2962,10 @@ msgid ""
 msgstr ""
 "\n"
 "        Напишіть, будь ласка, номер телефону, на який Ви хочете\n"
-"        отримувати текстові повідомлення. На наступному кроці він буде "
-"перевірений.\n"
+"        отримувати текстові повідомлення. На наступному кроці він буде перевірений.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:41
+#: aleksis/core/templates/two_factor/core/setup.html:45
 msgid ""
 "\n"
 "        Please enter the phone number you wish to be called on.\n"
@@ -3058,52 +2977,63 @@ msgstr ""
 "        отримувати дзвінки. На наступному кроці він буде перевірений.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup.html:50
+#: aleksis/core/templates/two_factor/core/setup.html:52
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "            We sent you a text message, please enter the tokens we sent.\n"
+#| "          "
 msgid ""
 "\n"
-"            We are calling your phone right now, please enter the digits you "
-"hear.\n"
+"        We sent you an email, please enter the token we sent.\n"
+"      "
+msgstr ""
+"\n"
+"            Ми надіслали Вам текстове повідомлення. Напишіть, будь ласка, отримані токени.\n"
+"          "
+
+#: aleksis/core/templates/two_factor/core/setup.html:60
+msgid ""
+"\n"
+"            We are calling your phone right now, please enter the digits you hear.\n"
 "          "
 msgstr ""
 "\n"
-"            Ми зараз телефонуємо на Ваш номер, – напишіть, будь ласка, "
-"цифри, які Ви почуєте.\n"
+"            Ми зараз телефонуємо на Ваш номер, – напишіть, будь ласка, цифри, які Ви почуєте.\n"
 "          "
 
-#: aleksis/core/templates/two_factor/core/setup.html:56
+#: aleksis/core/templates/two_factor/core/setup.html:66
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "            We sent you a text message, please enter the tokens we sent.\n"
+#| "          "
 msgid ""
 "\n"
-"            We sent you a text message, please enter the tokens we sent.\n"
+"            We sent you a text message, please enter the code we sent.\n"
 "          "
 msgstr ""
 "\n"
-"            Ми надіслали Вам текстове повідомлення. Напишіть, будь ласка, "
-"отримані токени.\n"
+"            Ми надіслали Вам текстове повідомлення. Напишіть, будь ласка, отримані токени.\n"
 "          "
 
-#: aleksis/core/templates/two_factor/core/setup.html:63
+#: aleksis/core/templates/two_factor/core/setup.html:73
 msgid ""
 "\n"
-"          We've encountered an issue with the selected authentication "
-"method. Please\n"
-"          go back and verify that you entered your information correctly, "
-"try\n"
-"          again, or use a different authentication method instead. If the "
-"issue\n"
+"          We've encountered an issue with the selected authentication method. Please\n"
+"          go back and verify that you entered your information correctly, try\n"
+"          again, or use a different authentication method instead. If the issue\n"
 "          persists, contact the site administrator.\n"
 "        "
 msgstr ""
 "\n"
-"          Ми помітили, що існує проблема з використанням обраного методу "
-"авторизації. Поверніться,\n"
-"          будь ласка, назад, та переконайтеся, що необхідні дані вказані "
-"правильно\n"
-"          і спробуйте увійте ще раз, або ж скористайтеся іншим варіантом "
-"входу. Якщо ж\n"
+"          Ми помітили, що існує проблема з використанням обраного методу авторизації. Поверніться,\n"
+"          будь ласка, назад, та переконайтеся, що необхідні дані вказані правильно\n"
+"          і спробуйте увійте ще раз, або ж скористайтеся іншим варіантом входу. Якщо ж\n"
 "          проблема залишається, зверніться до адміністратора сайту.\n"
 "        "
 
-#: aleksis/core/templates/two_factor/core/setup.html:73
+#: aleksis/core/templates/two_factor/core/setup.html:83
 msgid ""
 "\n"
 "        To identify and verify your YubiKey, please insert a\n"
@@ -3122,168 +3052,64 @@ msgstr ""
 msgid "Two-Factor Authentication successfully enabled"
 msgstr "Двохфакторна автентифікація успішно увімкнена"
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:14
+#: aleksis/core/templates/two_factor/core/setup_complete.html:13
 msgid ""
 "\n"
-"        Congratulations, you've successfully enabled two-factor "
-"authentication.\n"
+"        Congratulations, you've successfully enabled two-factor authentication.\n"
 "      "
 msgstr ""
 "\n"
 "        Вітаємо з успішним налаштуванням двохфакторної автентифікації.\n"
 "      "
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:24
-#: aleksis/core/templates/two_factor/core/setup_complete.html:44
+#: aleksis/core/templates/two_factor/core/setup_complete.html:22
+#: aleksis/core/templates/two_factor/core/setup_complete.html:40
 msgid "Back to Profile"
 msgstr "Назад до Профілю"
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:28
-#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+#: aleksis/core/templates/two_factor/core/setup_complete.html:26
+#: aleksis/core/templates/two_factor/core/setup_complete.html:44
 msgid "Generate backup codes"
 msgstr "Створити резервні коди"
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:34
+#: aleksis/core/templates/two_factor/core/setup_complete.html:31
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "          However, it might happen that you don't have access to\n"
+#| "          your primary token device. To enable account recovery, generate backup codes\n"
+#| "          or add a phone number.\n"
+#| "        "
 msgid ""
 "\n"
 "          However, it might happen that you don't have access to\n"
-"          your primary token device. To enable account recovery, generate "
-"backup codes\n"
-"          or add a phone number.\n"
+"          your primary device. To enable account recovery, generate backup codes\n"
+"          or add other authentication methods.\n"
 "        "
 msgstr ""
 "\n"
-"          Між іншим, може так статися, що Ви не матимете доступу до свого "
-"основного\n"
-"          пристрою з токенами. Для увімкнення відновлення обліковки створіть "
-"резервні коди\n"
+"          Між іншим, може так статися, що Ви не матимете доступу до свого основного\n"
+"          пристрою з токенами. Для увімкнення відновлення обліковки створіть резервні коди\n"
 "          або додайте номер телефону.\n"
 "        "
 
-#: aleksis/core/templates/two_factor/core/setup_complete.html:52
-#: aleksis/core/templates/two_factor/profile/profile.html:41
-msgid "Add Phone Number"
-msgstr "Додати номер телефону"
+#: aleksis/core/templates/two_factor/core/setup_complete.html:48
+msgid "Add Another Authentication Method"
+msgstr ""
 
 #: aleksis/core/templates/two_factor/profile/disable.html:5
 #: aleksis/core/templates/two_factor/profile/disable.html:9
-#: aleksis/core/templates/two_factor/profile/profile.html:63
-#: aleksis/core/templates/two_factor/profile/profile.html:73
 msgid "Disable Two-Factor Authentication"
 msgstr "Вимкнути двохфакторну автентифікацію"
 
 #: aleksis/core/templates/two_factor/profile/disable.html:12
-msgid ""
-"You are about to disable two-factor authentication. This weakens your "
-"account security, are you sure?"
-msgstr ""
-"Ви вимикаєте двохфакторну автентифікацію. Це знизить захист Вашого "
-"облікового запису. Ви впевнені?"
+msgid "You are about to disable two-factor authentication. This weakens your account security, are you sure?"
+msgstr "Ви вимикаєте двохфакторну автентифікацію. Це знизить захист Вашого облікового запису. Ви впевнені?"
 
 #: aleksis/core/templates/two_factor/profile/disable.html:26
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: aleksis/core/templates/two_factor/profile/profile.html:5
-#: aleksis/core/templates/two_factor/profile/profile.html:10
-msgid "Account Security"
-msgstr "Безпека облікового запису"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:15
-msgid "Tokens will be generated by your token generator."
-msgstr "Токени будуть створені Вашим генератором токенів."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:17
-#, python-format
-msgid "Primary method: %(primary)s"
-msgstr "Основний метод: %(primary)s"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:19
-msgid "Tokens will be generated by your YubiKey."
-msgstr "Токени будуть створені Вашим YubiKey."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:23
-msgid "Backup Phone Numbers"
-msgstr "Резервні номери телефонів"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:24
-msgid ""
-"If your primary method is not available, we are able to\n"
-"        send backup tokens to the phone numbers listed below."
-msgstr ""
-"Якщо Ваш основний метод не буде доступний, ми зможемо\n"
-"        надіслати резервні токени на вказані нижче телефонні номери."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:33
-msgid "Unregister"
-msgstr "Скасувати реєстрацію"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:48
-msgid ""
-"If you don't have any device with you, you can access\n"
-"        your account using backup tokens."
-msgstr ""
-"Якщо у Вас немає з собою жодного пристрою, Ви можете\n"
-"        отримати доступ з використанням резервних токенів."
-
-#: aleksis/core/templates/two_factor/profile/profile.html:50
-#, python-format
-msgid ""
-"\n"
-"        You have only one backup token remaining.\n"
-"      "
-msgid_plural ""
-"\n"
-"        You have %(counter)s backup tokens remaining.\n"
-"      "
-msgstr[0] ""
-"\n"
-"        У Вас залишився лише один резервний токен.\n"
-"      "
-msgstr[1] ""
-"\n"
-"        У Вас залишилися %(counter)s резервних токени.\n"
-"      "
-msgstr[2] ""
-"\n"
-"        У Вас залишилося %(counter)s резервних токенів.\n"
-"      "
-msgstr[3] ""
-"\n"
-"        У Вас залишився %(counter)s резервний токен.\n"
-"      "
-
-#: aleksis/core/templates/two_factor/profile/profile.html:59
-msgid "Show Codes"
-msgstr "Показати коди"
-
-#: aleksis/core/templates/two_factor/profile/profile.html:65
-msgid ""
-"\n"
-"        However we strongly discourage you to do so, you can\n"
-"        also disable two-factor authentication for your account.\n"
-"      "
-msgstr ""
-"\n"
-"        Хоча ми рішуче застерігаємо Вас це не робити, Ви можете \n"
-"        також вимкнути двохфакторну автентифікацію для свого облікового "
-"запису.\n"
-"      "
-
-#: aleksis/core/templates/two_factor/profile/profile.html:78
-msgid ""
-"\n"
-"        Two-factor authentication is not enabled for your\n"
-"        account. Enable two-factor authentication for enhanced account\n"
-"        security.\n"
-"      "
-msgstr ""
-"\n"
-"        Двохфакторна автентифікація для Вашого облікового запису\n"
-"        не активована. Для підвищення безпеки облікового запису увімкніть\n"
-"        двохфакторну автентифікацію.\n"
-"      "
-
 #: aleksis/core/util/notifications.py:64
 msgid "E-Mail"
 msgstr "Ел.пошта"
@@ -3312,160 +3138,259 @@ msgstr "Під час створення файлу PDF виникла проб
 msgid "Download PDF"
 msgstr "Звантажити PDF"
 
-#: aleksis/core/views.py:278
+#: aleksis/core/views.py:280
 msgid "The school term has been created."
 msgstr "Навчальний рік створений."
 
-#: aleksis/core/views.py:290
+#: aleksis/core/views.py:292
 msgid "The school term has been saved."
 msgstr "Навчальний рік збережений."
 
-#: aleksis/core/views.py:394
+#: aleksis/core/views.py:396
 msgid "The child groups were successfully saved."
 msgstr "Підлеглі групи збережені."
 
-#: aleksis/core/views.py:413 aleksis/core/views.py:423
+#: aleksis/core/views.py:415 aleksis/core/views.py:425
 msgid "The person has been saved."
 msgstr "Особа збережена."
 
-#: aleksis/core/views.py:473
+#: aleksis/core/views.py:475
 msgid "The group has been saved."
 msgstr "Група збережена."
 
-#: aleksis/core/views.py:556
+#: aleksis/core/views.py:558
 msgid "The announcement has been saved."
 msgstr "Оголошення збережене."
 
-#: aleksis/core/views.py:572
+#: aleksis/core/views.py:574
 msgid "The announcement has been deleted."
 msgstr "Оголошення видалене."
 
-#: aleksis/core/views.py:641
+#: aleksis/core/views.py:643
 msgid "The requested preference registry does not exist"
 msgstr "Журналу із запитаними властивостями не існує"
 
-#: aleksis/core/views.py:660
+#: aleksis/core/views.py:662
 msgid "The preferences have been saved successfully."
 msgstr "Властивості збережені."
 
-#: aleksis/core/views.py:684
+#: aleksis/core/views.py:686
 msgid "The person has been deleted."
 msgstr "Особа видалена."
 
-#: aleksis/core/views.py:698
+#: aleksis/core/views.py:700
 msgid "The group has been deleted."
 msgstr "Група видалена."
 
-#: aleksis/core/views.py:730
+#: aleksis/core/views.py:732
 msgid "The additional field has been saved."
 msgstr "Додаткове поле збережене."
 
-#: aleksis/core/views.py:765
+#: aleksis/core/views.py:767
 msgid "The additional field has been deleted."
 msgstr "Додаткове поле видалене."
 
-#: aleksis/core/views.py:790
+#: aleksis/core/views.py:792
 msgid "The group type has been saved."
 msgstr "Тип групи збережений."
 
-#: aleksis/core/views.py:821
+#: aleksis/core/views.py:823
 msgid "The group type has been deleted."
 msgstr "Тип групи видалений."
 
-#: aleksis/core/views.py:856
+#: aleksis/core/views.py:858
 msgid "Progress: Run data checks"
 msgstr "Перебіг: Запуск перевірки даних"
 
-#: aleksis/core/views.py:857
+#: aleksis/core/views.py:859
 msgid "Run data checks …"
 msgstr "Запускається перевірка даних …"
 
-#: aleksis/core/views.py:858
+#: aleksis/core/views.py:860
 msgid "The data checks were run successfully."
 msgstr "Перевірка даних успішно запущена."
 
-#: aleksis/core/views.py:859
+#: aleksis/core/views.py:861
 msgid "There was a problem while running data checks."
 msgstr "Під час запуску перевірки даних виникла проблема."
 
-#: aleksis/core/views.py:876
+#: aleksis/core/views.py:878
 #, python-brace-format
 msgid "The solve option '{solve_option_obj.verbose_name}' "
 msgstr "Варіант розв'язання \"{solve_option_obj.verbose_name}\" "
 
-#: aleksis/core/views.py:886
+#: aleksis/core/views.py:888
 msgid "The requested solve option does not exist"
 msgstr "Запитаний варіант розв'язання не існує"
 
-#: aleksis/core/views.py:919
+#: aleksis/core/views.py:921
 msgid "The dashboard widget has been saved."
 msgstr "Віджет інформпанелі збережений."
 
-#: aleksis/core/views.py:949
+#: aleksis/core/views.py:951
 msgid "The dashboard widget has been created."
 msgstr "Віджет інформпанелі створений."
 
-#: aleksis/core/views.py:959
+#: aleksis/core/views.py:961
 msgid "The dashboard widget has been deleted."
 msgstr "Віджет інформпанелі видалений."
 
-#: aleksis/core/views.py:1030 aleksis/core/views.py:1031
+#: aleksis/core/views.py:1033
 msgid "Your dashboard configuration has been saved successfully."
 msgstr "Ваша конфігурація інформпанелі збережена."
 
-#: aleksis/core/views.py:1032 aleksis/core/views.py:1033
+#: aleksis/core/views.py:1035
 msgid "The configuration of the default dashboard has been saved successfully."
 msgstr "Конфігурація типової/стандартної інформпанелі збережена."
 
-#: aleksis/core/views.py:1103 aleksis/core/views.py:1104
+#: aleksis/core/views.py:1106
 #, python-brace-format
 msgid "The invitation was successfully created. The invitation code is {code}"
 msgstr "Запрошення успішно створене. Код запрошення: {code}"
 
-#: aleksis/core/views.py:1200 aleksis/core/views.py:1201
+#: aleksis/core/views.py:1203
 msgid "We have successfully assigned the permissions."
 msgstr "Ми успішно призначили дозволи."
 
-#: aleksis/core/views.py:1210 aleksis/core/views.py:1211
+#: aleksis/core/views.py:1213
 msgid "The global user permission has been deleted."
 msgstr "Глобальний користувацький дозвіл видалений."
 
-#: aleksis/core/views.py:1220 aleksis/core/views.py:1221
+#: aleksis/core/views.py:1223
 msgid "The global group permission has been deleted."
 msgstr "Глобальний груповий дозвіл видалений."
 
-#: aleksis/core/views.py:1230 aleksis/core/views.py:1231
+#: aleksis/core/views.py:1233
 msgid "The object user permission has been deleted."
 msgstr "Об'єктний користувацький дозвіл видалений."
 
-#: aleksis/core/views.py:1240 aleksis/core/views.py:1241
+#: aleksis/core/views.py:1243
 msgid "The object group permission has been deleted."
 msgstr "Об'єктний груповий дозвіл видалений."
 
-#: aleksis/core/views.py:1349 aleksis/core/views.py:1350
-msgid ""
-"The third-party account could not be disconnected because it is the only "
-"login method available."
-msgstr ""
-"Обліковий запис третьої сторони не можна від'єднати оскільки він єдиний "
-"спосіб для входу."
+#: aleksis/core/views.py:1352
+msgid "The third-party account could not be disconnected because it is the only login method available."
+msgstr "Обліковий запис третьої сторони не можна від'єднати оскільки він єдиний спосіб для входу."
 
-#: aleksis/core/views.py:1356 aleksis/core/views.py:1357
+#: aleksis/core/views.py:1359
 msgid "The third-party account has been successfully disconnected."
 msgstr "Обліковий запис третьої сторони успішно від'єднаний."
 
-#: aleksis/core/views.py:1432 aleksis/core/views.py:1433
-msgid ""
-"Person was invited successfully and an email with further instructions has "
-"been send to them."
-msgstr ""
-"Особа успішно запрошена. Лист з інструкціями щодо наступних дій надісланий "
-"на її ел.пошту."
+#: aleksis/core/views.py:1435
+msgid "Person was invited successfully and an email with further instructions has been send to them."
+msgstr "Особа успішно запрошена. Лист з інструкціями щодо наступних дій надісланий на її ел.пошту."
 
-#: aleksis/core/views.py:1443 aleksis/core/views.py:1444
+#: aleksis/core/views.py:1446
 msgid "Person was already invited."
 msgstr "Особа вже була запрошена."
 
+#~ msgid ""
+#~ "\n"
+#~ "            This page is currently unavailable. If this error persists, contact your site administrators:\n"
+#~ "          "
+#~ msgstr ""
+#~ "\n"
+#~ "            Ця сторінка наразі недоступна. Якщо ця помилка виникне знову, зверніться до адміністраторів сайту:\n"
+#~ "          "
+
+#~ msgid ""
+#~ "Two-factor authentication is not enabled for your\n"
+#~ "          account. Enable two-factor authentication for enhanced account\n"
+#~ "          security."
+#~ msgstr ""
+#~ "Двохфакторна автентифікація у Вашому обліковому записі\n"
+#~ "          вимкнена. Для збільшення безпеки обліковки увімкніть двохфакторну\n"
+#~ "          автентифікацію."
+
+#~ msgid "Add Phone Number"
+#~ msgstr "Додати номер телефону"
+
+#~ msgid "Account Security"
+#~ msgstr "Безпека облікового запису"
+
+#~ msgid "Tokens will be generated by your token generator."
+#~ msgstr "Токени будуть створені Вашим генератором токенів."
+
+#, python-format
+#~ msgid "Primary method: %(primary)s"
+#~ msgstr "Основний метод: %(primary)s"
+
+#~ msgid "Tokens will be generated by your YubiKey."
+#~ msgstr "Токени будуть створені Вашим YubiKey."
+
+#~ msgid "Backup Phone Numbers"
+#~ msgstr "Резервні номери телефонів"
+
+#~ msgid ""
+#~ "If your primary method is not available, we are able to\n"
+#~ "        send backup tokens to the phone numbers listed below."
+#~ msgstr ""
+#~ "Якщо Ваш основний метод не буде доступний, ми зможемо\n"
+#~ "        надіслати резервні токени на вказані нижче телефонні номери."
+
+#~ msgid "Unregister"
+#~ msgstr "Скасувати реєстрацію"
+
+#~ msgid ""
+#~ "If you don't have any device with you, you can access\n"
+#~ "        your account using backup tokens."
+#~ msgstr ""
+#~ "Якщо у Вас немає з собою жодного пристрою, Ви можете\n"
+#~ "        отримати доступ з використанням резервних токенів."
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "        You have only one backup token remaining.\n"
+#~ "      "
+#~ msgid_plural ""
+#~ "\n"
+#~ "        You have %(counter)s backup tokens remaining.\n"
+#~ "      "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "        У Вас залишився лише один резервний токен.\n"
+#~ "      "
+#~ msgstr[1] ""
+#~ "\n"
+#~ "        У Вас залишилися %(counter)s резервних токени.\n"
+#~ "      "
+#~ msgstr[2] ""
+#~ "\n"
+#~ "        У Вас залишилося %(counter)s резервних токенів.\n"
+#~ "      "
+#~ msgstr[3] ""
+#~ "\n"
+#~ "        У Вас залишився %(counter)s резервний токен.\n"
+#~ "      "
+
+#~ msgid "Show Codes"
+#~ msgstr "Показати коди"
+
+#~ msgid ""
+#~ "\n"
+#~ "        However we strongly discourage you to do so, you can\n"
+#~ "        also disable two-factor authentication for your account.\n"
+#~ "      "
+#~ msgstr ""
+#~ "\n"
+#~ "        Хоча ми рішуче застерігаємо Вас це не робити, Ви можете \n"
+#~ "        також вимкнути двохфакторну автентифікацію для свого облікового запису.\n"
+#~ "      "
+
+#~ msgid ""
+#~ "\n"
+#~ "        Two-factor authentication is not enabled for your\n"
+#~ "        account. Enable two-factor authentication for enhanced account\n"
+#~ "        security.\n"
+#~ "      "
+#~ msgstr ""
+#~ "\n"
+#~ "        Двохфакторна автентифікація для Вашого облікового запису\n"
+#~ "        не активована. Для підвищення безпеки облікового запису увімкніть\n"
+#~ "        двохфакторну автентифікацію.\n"
+#~ "      "
+
 #~ msgid "Birthday Calendar"
 #~ msgstr "Календар Днів Народження"
 
@@ -3569,14 +3494,8 @@ msgstr "Особа вже була запрошена."
 #~ msgid "ICal Feeds"
 #~ msgstr "iCal-стрічки"
 
-#~ msgid ""
-#~ "These are URLs for different Calendar Feeds in the iCal (.ics) format. "
-#~ "You can create as many as you want and import them in your calendar "
-#~ "software."
-#~ msgstr ""
-#~ "Тут містяться посилання на різні стрічки календарів у форматі iCal (."
-#~ "ics). Ви можете створити їх стільки, скільки Вам необхідно та імпортувати "
-#~ "їх у ПЗ для роботи з календарями."
+#~ msgid "These are URLs for different Calendar Feeds in the iCal (.ics) format. You can create as many as you want and import them in your calendar software."
+#~ msgstr "Тут містяться посилання на різні стрічки календарів у форматі iCal (.ics). Ви можете створити їх стільки, скільки Вам необхідно та імпортувати їх у ПЗ для роботи з календарями."
 
 #~ msgid "Your iCal URLs"
 #~ msgstr "Ваші посилання iCal"
@@ -3601,30 +3520,24 @@ msgstr "Особа вже була запрошена."
 
 #~ msgid ""
 #~ "\n"
-#~ "              This platform is powered by AlekSIS®, a web-based school "
-#~ "information system (SIS) which can be used\n"
-#~ "              to manage and/or publish organisational artifacts of "
-#~ "educational institutions. AlekSIS is free software and\n"
+#~ "              This platform is powered by AlekSIS®, a web-based school information system (SIS) which can be used\n"
+#~ "              to manage and/or publish organisational artifacts of educational institutions. AlekSIS is free software and\n"
 #~ "              can be used by anyone.\n"
 #~ "            "
 #~ msgstr ""
 #~ "\n"
-#~ "              Ця платформа базується на AlekSIS®, веб-інструменті "
-#~ "інформаційної системи для навчання (SIS) за допомогою якої\n"
-#~ "              можна керувати та/або висвітлювати організаційні елементи "
-#~ "навчальних закладів. AlekSIS - безплатне ПЗ\n"
+#~ "              Ця платформа базується на AlekSIS®, веб-інструменті інформаційної системи для навчання (SIS) за допомогою якої\n"
+#~ "              можна керувати та/або висвітлювати організаційні елементи навчальних закладів. AlekSIS - безплатне ПЗ\n"
 #~ "              і ним може користуватися будь-хто.\n"
 #~ "            "
 
 #~ msgid ""
 #~ "\n"
-#~ "              AlekSIS® is a registered trademark of the AlekSIS open "
-#~ "source project, represented by Teckids e.V.\n"
+#~ "              AlekSIS® is a registered trademark of the AlekSIS open source project, represented by Teckids e.V.\n"
 #~ "            "
 #~ msgstr ""
 #~ "\n"
-#~ "              AlekSIS® – зареєстрована торгова марка проекту з відкритим "
-#~ "програмним кодом AlekSIS, що представлена Teckids e.V.\n"
+#~ "              AlekSIS® – зареєстрована торгова марка проекту з відкритим програмним кодом AlekSIS, що представлена Teckids e.V.\n"
 #~ "            "
 
 #~ msgid "Website of AlekSIS"
@@ -3638,18 +3551,14 @@ msgstr "Особа вже була запрошена."
 
 #~ msgid ""
 #~ "\n"
-#~ "              The core and the official apps of AlekSIS are licenced "
-#~ "under the EUPL, version 1.2 or later. For licence\n"
-#~ "              information from third-party apps, if installed, refer to "
-#~ "the respective components below. The\n"
+#~ "              The core and the official apps of AlekSIS are licenced under the EUPL, version 1.2 or later. For licence\n"
+#~ "              information from third-party apps, if installed, refer to the respective components below. The\n"
 #~ "              licences are marked like this:\n"
 #~ "            "
 #~ msgstr ""
 #~ "\n"
-#~ "              Ядро та офіційні додатки AlekSIS ліцензовані EUPL, версії "
-#~ "1.2 та новіше. Для отримання інформації\n"
-#~ "              щодо додатків третіх сторін, якщо такі встановлені, "
-#~ "перейдіть до відповідних компонентів нижче.\n"
+#~ "              Ядро та офіційні додатки AlekSIS ліцензовані EUPL, версії 1.2 та новіше. Для отримання інформації\n"
+#~ "              щодо додатків третіх сторін, якщо такі встановлені, перейдіть до відповідних компонентів нижче.\n"
 #~ "              Ці ліцензії мають таку позначку:\n"
 #~ "            "
 
@@ -3665,25 +3574,13 @@ msgstr "Особа вже була запрошена."
 #~ msgid "More information about the EUPL"
 #~ msgstr "Більше інформації щодо EUPL"
 
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "                    This app is licenced under %(licence)s.\n"
-#~ "                  "
-#~ msgstr ""
-#~ "\n"
-#~ "                    Цей додаток ліцензований під %(licence)s.\n"
-#~ "                  "
-
 #~ msgid ""
 #~ "\n"
-#~ "              Without activated JavaScript the progress status can't be "
-#~ "updated.\n"
+#~ "              Without activated JavaScript the progress status can't be updated.\n"
 #~ "            "
 #~ msgstr ""
 #~ "\n"
-#~ "              Без активованого JavaScript статус виконання не зможе "
-#~ "оновлюватися.\n"
+#~ "              Без активованого JavaScript статус виконання не зможе оновлюватися.\n"
 #~ "            "
 
 #~ msgid "Language"
@@ -3694,14 +3591,12 @@ msgstr "Особа вже була запрошена."
 
 #~ msgid ""
 #~ "\n"
-#~ "            Your administrator account is not linked to any person. "
-#~ "Therefore,\n"
+#~ "            Your administrator account is not linked to any person. Therefore,\n"
 #~ "            a dummy person has been linked to your account.\n"
 #~ "          "
 #~ msgstr ""
 #~ "\n"
-#~ "            Ваш адміністративний обліковий запис не поєднаний з жодною "
-#~ "особою. Через це\n"
+#~ "            Ваш адміністративний обліковий запис не поєднаний з жодною особою. Через це\n"
 #~ "            до Вашого облікового запису приєднана фейкова особа.\n"
 #~ "          "
 
@@ -3714,10 +3609,8 @@ msgstr "Особа вже була запрошена."
 #~ msgstr ""
 #~ "\n"
 #~ "            Ваш обліковий запис не пов'язаний з фізособою. Це означає,\n"
-#~ "            що Ви не маєте жодного доступу до навчальної інформації. "
-#~ "Зверніться,\n"
-#~ "            будь ласка, до адміністраторів AlekSIS у Вашому навчальному "
-#~ "закладі.\n"
+#~ "            що Ви не маєте жодного доступу до навчальної інформації. Зверніться,\n"
+#~ "            будь ласка, до адміністраторів AlekSIS у Вашому навчальному закладі.\n"
 #~ "          "
 
 #~ msgid "Impersonate"